<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211646] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211646">211646</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2017-02-03 12:53:35 -0800 (Fri, 03 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct memory leak in MediaConstraints
https://bugs.webkit.org/show_bug.cgi?id=167744
<rdar://problem/30331444>
Reviewed by Anders Carlsson.
ConstraintHolder returns a reference to an object created by operator new. When the
returned value is assigned or stored in Vector or other containers we leak memory.
Instead, this value should just be returned as a regular object so that the return
value optimization can make sure memory is properly (and efficiently) used.
Tested by existing mediastream tests.
* platform/mediastream/MediaConstraints.h:
(WebCore::FlattenedConstraint::ConstraintHolder::create): Return by value.
(WebCore::FlattenedConstraint::ConstraintHolder::~ConstraintHolder): Don't attempt to
delete memory that was moved away.
(WebCore::FlattenedConstraint::ConstraintHolder::ConstraintHolder): Add Move constructor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaConstraintsh">trunk/Source/WebCore/platform/mediastream/MediaConstraints.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211645 => 211646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-03 20:49:39 UTC (rev 211645)
+++ trunk/Source/WebCore/ChangeLog 2017-02-03 20:53:35 UTC (rev 211646)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-03 Brent Fulgham <bfulgham@apple.com>
+
+ Correct memory leak in MediaConstraints
+ https://bugs.webkit.org/show_bug.cgi?id=167744
+ <rdar://problem/30331444>
+
+ Reviewed by Anders Carlsson.
+
+ ConstraintHolder returns a reference to an object created by operator new. When the
+ returned value is assigned or stored in Vector or other containers we leak memory.
+ Instead, this value should just be returned as a regular object so that the return
+ value optimization can make sure memory is properly (and efficiently) used.
+
+ Tested by existing mediastream tests.
+
+ * platform/mediastream/MediaConstraints.h:
+ (WebCore::FlattenedConstraint::ConstraintHolder::create): Return by value.
+ (WebCore::FlattenedConstraint::ConstraintHolder::~ConstraintHolder): Don't attempt to
+ delete memory that was moved away.
+ (WebCore::FlattenedConstraint::ConstraintHolder::ConstraintHolder): Add Move constructor.
+
</ins><span class="cx"> 2017-02-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix bad assertion under HTMLTreeBuilder::processStartTagForInBody()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaConstraints.h (211645 => 211646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2017-02-03 20:49:39 UTC (rev 211645)
+++ trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2017-02-03 20:53:35 UTC (rev 211646)
</span><span class="lines">@@ -713,31 +713,53 @@
</span><span class="cx"> private:
</span><span class="cx"> class ConstraintHolder {
</span><span class="cx"> public:
</span><del>- static ConstraintHolder& create(const MediaConstraint& value) { return *new ConstraintHolder(value); }
</del><ins>+ static ConstraintHolder create(const MediaConstraint& value) { return ConstraintHolder(value); }
</ins><span class="cx">
</span><span class="cx"> ~ConstraintHolder()
</span><span class="cx"> {
</span><del>- switch (dataType()) {
</del><ins>+ if (m_value.asRaw) {
+ switch (dataType()) {
+ case MediaConstraint::DataType::Integer:
+ delete m_value.asInteger;
+ break;
+ case MediaConstraint::DataType::Double:
+ delete m_value.asDouble;
+ break;
+ case MediaConstraint::DataType::Boolean:
+ delete m_value.asBoolean;
+ break;
+ case MediaConstraint::DataType::String:
+ delete m_value.asString;
+ break;
+ case MediaConstraint::DataType::None:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ }
+#ifndef NDEBUG
+ m_value.asRaw = reinterpret_cast<MediaConstraint*>(0xbbadbeef);
+#endif
+ }
+
+ ConstraintHolder(ConstraintHolder&& other)
+ {
+ switch (other.dataType()) {
</ins><span class="cx"> case MediaConstraint::DataType::Integer:
</span><del>- delete m_value.asInteger;
</del><ins>+ m_value.asInteger = std::exchange(other.m_value.asInteger, nullptr);
</ins><span class="cx"> break;
</span><span class="cx"> case MediaConstraint::DataType::Double:
</span><del>- delete m_value.asDouble;
</del><ins>+ m_value.asDouble = std::exchange(other.m_value.asDouble, nullptr);
</ins><span class="cx"> break;
</span><span class="cx"> case MediaConstraint::DataType::Boolean:
</span><del>- delete m_value.asBoolean;
</del><ins>+ m_value.asBoolean = std::exchange(other.m_value.asBoolean, nullptr);
</ins><span class="cx"> break;
</span><span class="cx"> case MediaConstraint::DataType::String:
</span><del>- delete m_value.asString;
</del><ins>+ m_value.asString = std::exchange(other.m_value.asString, nullptr);
</ins><span class="cx"> break;
</span><span class="cx"> case MediaConstraint::DataType::None:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
-#ifndef NDEBUG
- m_value.asRaw = reinterpret_cast<MediaConstraint*>(0xbbadbeef);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaConstraint& constraint() const { return *m_value.asRaw; }
</span></span></pre>
</div>
</div>
</body>
</html>