<!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>[179163] 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/179163">179163</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-26 20:39:58 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/179101">r179101</a>): SVGUseElement::expandUseElementsInShadowTree has an object lifetime mistake
https://bugs.webkit.org/show_bug.cgi?id=140921
Reviewed by Alexey Proskuryakov.
Bug found by running regression tests with Address Sanitizer.
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::expandUseElementsInShadowTree): Use a Ref to protect
the original use element after it's been replaced in the tree; we use it for
one more thing after that.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179162 => 179163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-27 04:06:36 UTC (rev 179162)
+++ trunk/Source/WebCore/ChangeLog 2015-01-27 04:39:58 UTC (rev 179163)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-26 Darin Adler <darin@apple.com>
+
+ REGRESSION (r179101): SVGUseElement::expandUseElementsInShadowTree has an object lifetime mistake
+ https://bugs.webkit.org/show_bug.cgi?id=140921
+
+ Reviewed by Alexey Proskuryakov.
+
+ Bug found by running regression tests with Address Sanitizer.
+
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::expandUseElementsInShadowTree): Use a Ref to protect
+ the original use element after it's been replaced in the tree; we use it for
+ one more thing after that.
+
</ins><span class="cx"> 2015-01-26 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL 2.0: Actually allow for experimental-webgl2 context creation.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (179162 => 179163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2015-01-27 04:06:36 UTC (rev 179162)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2015-01-27 04:39:58 UTC (rev 179163)
</span><span class="lines">@@ -609,10 +609,10 @@
</span><span class="cx"> auto descendants = descendantsOfType<SVGUseElement>(*userAgentShadowRoot());
</span><span class="cx"> auto end = descendants.end();
</span><span class="cx"> for (auto it = descendants.begin(); it != end; ) {
</span><del>- SVGUseElement& original = *it;
</del><ins>+ Ref<SVGUseElement> original = *it;
</ins><span class="cx"> it = end; // Efficiently quiets assertions due to the outstanding iterator.
</span><span class="cx">
</span><del>- ASSERT(!original.cachedDocumentIsStillLoading());
</del><ins>+ ASSERT(!original->cachedDocumentIsStillLoading());
</ins><span class="cx">
</span><span class="cx"> // Spec: In the generated content, the 'use' will be replaced by 'g', where all attributes from the
</span><span class="cx"> // 'use' element except for x, y, width, height and xlink:href are transferred to the generated 'g' element.
</span><span class="lines">@@ -623,11 +623,11 @@
</span><span class="cx"> ASSERT(referencedDocument());
</span><span class="cx"> auto replacement = SVGGElement::create(SVGNames::gTag, *referencedDocument());
</span><span class="cx">
</span><del>- original.transferAttributesToShadowTreeReplacement(replacement.get());
- original.cloneChildNodes(replacement.ptr());
</del><ins>+ original->transferAttributesToShadowTreeReplacement(replacement.get());
+ original->cloneChildNodes(replacement.ptr());
</ins><span class="cx">
</span><span class="cx"> RefPtr<SVGElement> clonedTarget;
</span><del>- Element* targetCandidate = SVGURIReference::targetElementFromIRIString(original.href(), *referencedDocument());
</del><ins>+ Element* targetCandidate = SVGURIReference::targetElementFromIRIString(original->href(), *referencedDocument());
</ins><span class="cx"> if (is<SVGElement>(targetCandidate) && !isDisallowedElement(downcast<SVGElement>(*targetCandidate))) {
</span><span class="cx"> SVGElement& originalTarget = downcast<SVGElement>(*targetCandidate);
</span><span class="cx"> clonedTarget = static_pointer_cast<SVGElement>(originalTarget.cloneElementWithChildren(document()));
</span><span class="lines">@@ -641,12 +641,12 @@
</span><span class="cx"> removeDisallowedElementsFromSubtree(replacement.get());
</span><span class="cx">
</span><span class="cx"> // Replace <use> with the <g> element we created.
</span><del>- original.parentNode()->replaceChild(replacement.ptr(), &original);
</del><ins>+ original->parentNode()->replaceChild(replacement.ptr(), original.ptr());
</ins><span class="cx">
</span><span class="cx"> // Call transferSizeAttributesToShadowTreeTargetClone after putting the cloned elements into the
</span><span class="cx"> // shadow tree so it can use SVGElement::correspondingElement without triggering an assertion.
</span><span class="cx"> if (clonedTarget)
</span><del>- original.transferSizeAttributesToShadowTreeTargetClone(*clonedTarget);
</del><ins>+ original->transferSizeAttributesToShadowTreeTargetClone(*clonedTarget);
</ins><span class="cx">
</span><span class="cx"> // Continue iterating from the <g> element since the <use> element was replaced.
</span><span class="cx"> it = descendants.from(replacement.get());
</span></span></pre>
</div>
</div>
</body>
</html>