<!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>[190012] trunk</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/190012">190012</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-09-19 02:56:12 -0700 (Sat, 19 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Null dereference loading Blink layout test svg/custom/use-href-attr-removal-crash.html
https://bugs.webkit.org/show_bug.cgi?id=149315
<rdar://problem/22749358>
Reviewed by Tim Horton.
Source/WebCore:
We were not checking if the corresponding element referenced from
the SVG <use> actually existed before trying to set attributes on it.
The original Blink change is a little more detailed:
https://chromium.googlesource.com/chromium/blink/+/e2f1087f32bb088160ab7d59a715a1403ef267c7
However, we've significantly diverged at this point.
Tests: svg/custom/use-href-attr-removal-crash.html
svg/custom/use-href-attr-removal-crash2.svg
svg/custom/use-href-change-local-to-invalid-remote.html
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::transferSizeAttributesToTargetClone):
LayoutTests:
These tests, copied from Blink, should not crash.
The originals come from:
https://chromium.googlesource.com/chromium/blink/+/e2f1087f32bb088160ab7d59a715a1403ef267c7
* svg/custom/use-href-attr-removal-crash.html: Added.
* svg/custom/use-href-attr-removal-crash-expected.txt: Added.
* svg/custom/use-href-attr-removal-crash2.svg: Added.
* svg/custom/use-href-attr-removal-crash2-expected.txt: Added.
* svg/custom/use-href-change-local-to-invalid-remote.html: Added.
* svg/custom/use-href-change-local-to-invalid-remote-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustomusehrefattrremovalcrashexpectedtxt">trunk/LayoutTests/svg/custom/use-href-attr-removal-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomusehrefattrremovalcrashhtml">trunk/LayoutTests/svg/custom/use-href-attr-removal-crash.html</a></li>
<li><a href="#trunkLayoutTestssvgcustomusehrefattrremovalcrash2expectedtxt">trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomusehrefattrremovalcrash2svg">trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2.svg</a></li>
<li><a href="#trunkLayoutTestssvgcustomusehrefchangelocaltoinvalidremoteexpectedtxt">trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomusehrefchangelocaltoinvalidremotehtml">trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190011 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-19 08:57:33 UTC (rev 190011)
+++ trunk/LayoutTests/ChangeLog 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-09-18 Dean Jackson <dino@apple.com>
+
+ Null dereference loading Blink layout test svg/custom/use-href-attr-removal-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=149315
+ <rdar://problem/22749358>
+
+ Reviewed by Tim Horton.
+
+ These tests, copied from Blink, should not crash.
+ The originals come from:
+ https://chromium.googlesource.com/chromium/blink/+/e2f1087f32bb088160ab7d59a715a1403ef267c7
+
+ * svg/custom/use-href-attr-removal-crash.html: Added.
+ * svg/custom/use-href-attr-removal-crash-expected.txt: Added.
+ * svg/custom/use-href-attr-removal-crash2.svg: Added.
+ * svg/custom/use-href-attr-removal-crash2-expected.txt: Added.
+ * svg/custom/use-href-change-local-to-invalid-remote.html: Added.
+ * svg/custom/use-href-change-local-to-invalid-remote-expected.txt: Added.
+
</ins><span class="cx"> 2015-09-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Update Mac expectations for http/tests/cache/iframe-304-crash.html.
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomusehrefattrremovalcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash-expected.txt (0 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/use-href-attr-removal-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/custom/use-href-attr-removal-crash-expected.txt 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if no crash.
+
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcustomusehrefattrremovalcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash.html (0 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/use-href-attr-removal-crash.html (rev 0)
+++ trunk/LayoutTests/svg/custom/use-href-attr-removal-crash.html 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<p>PASS if no crash.</p>
+<svg>
+ <symbol id="a"><rect width="100" height="100" fill="blue"/></symbol>
+ <use id="b" xlink:href="#a"></use>
+ <rect id="c" width="100" height="100" fill="red"/>
+</svg>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+onload = function() {
+ var use = document.getElementById('b');
+ use.removeAttribute("xlink:href");
+ var symbol = document.getElementById("a");
+ symbol.appendChild(document.getElementById("c"));
+ use.setAttribute("height", "100");
+}
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcustomusehrefattrremovalcrash2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2-expected.txt (0 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2-expected.txt 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS: The text is displayed and the file did not trigger a crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcustomusehrefattrremovalcrash2svg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2.svg (0 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2.svg (rev 0)
+++ trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2.svg 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <symbol id="a"/>
+ <use id="b" xlink:href="#a"/>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ b = document.getElementById('b');
+ b.href.baseVal = "#a";
+ onload = function() {
+ document.getElementById("a").remove();
+ b.setAttribute("width", 100);
+ };
+ </script>
+ <text y="20">PASS: The text is displayed and the file did not trigger a crash.</text>
+</svg>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/use-href-attr-removal-crash2.svg
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcustomusehrefchangelocaltoinvalidremoteexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote-expected.txt (0 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote-expected.txt 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if no crash.
+
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcustomusehrefchangelocaltoinvalidremotehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote.html (0 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote.html (rev 0)
+++ trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote.html 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<p>PASS if no crash.</p>
+<svg>
+ <rect width="100" height="100" fill="green"/>
+ <defs>
+ <rect id="a" width="100" height="100" fill="red"/>
+ </defs>
+ <use xlink:href="#a"/>
+</svg>
+<script>
+onload = function() {
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ var use = document.querySelector('use');
+ use.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', 'invalid-remote.svg');
+ document.getElementById('a').setAttribute('width', 200);
+ use.setAttribute('width', 100);
+}
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/use-href-change-local-to-invalid-remote.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190011 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-19 08:57:33 UTC (rev 190011)
+++ trunk/Source/WebCore/ChangeLog 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-09-18 Dean Jackson <dino@apple.com>
+
+ Null dereference loading Blink layout test svg/custom/use-href-attr-removal-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=149315
+ <rdar://problem/22749358>
+
+ Reviewed by Tim Horton.
+
+ We were not checking if the corresponding element referenced from
+ the SVG <use> actually existed before trying to set attributes on it.
+ The original Blink change is a little more detailed:
+ https://chromium.googlesource.com/chromium/blink/+/e2f1087f32bb088160ab7d59a715a1403ef267c7
+ However, we've significantly diverged at this point.
+
+ Tests: svg/custom/use-href-attr-removal-crash.html
+ svg/custom/use-href-attr-removal-crash2.svg
+ svg/custom/use-href-change-local-to-invalid-remote.html
+
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::transferSizeAttributesToTargetClone):
+
</ins><span class="cx"> 2015-09-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r189908.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (190011 => 190012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2015-09-19 08:57:33 UTC (rev 190011)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2015-09-19 09:56:12 UTC (rev 190012)
</span><span class="lines">@@ -139,8 +139,9 @@
</span><span class="cx"> } else if (is<SVGSVGElement>(shadowElement)) {
</span><span class="cx"> // Spec (<use> on <svg>): If attributes width and/or height are provided on the 'use' element, then these
</span><span class="cx"> // values will override the corresponding attributes on the 'svg' in the generated tree.
</span><del>- shadowElement.setAttribute(SVGNames::widthAttr, (widthIsValid() && width().valueInSpecifiedUnits()) ? AtomicString(width().valueAsString()) : shadowElement.correspondingElement()->getAttribute(SVGNames::widthAttr));
- shadowElement.setAttribute(SVGNames::heightAttr, (heightIsValid() && height().valueInSpecifiedUnits()) ? AtomicString(height().valueAsString()) : shadowElement.correspondingElement()->getAttribute(SVGNames::heightAttr));
</del><ins>+ SVGElement* correspondingElement = shadowElement.correspondingElement();
+ shadowElement.setAttribute(SVGNames::widthAttr, (widthIsValid() && width().valueInSpecifiedUnits()) ? AtomicString(width().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::widthAttr) : nullAtom));
+ shadowElement.setAttribute(SVGNames::heightAttr, (heightIsValid() && height().valueInSpecifiedUnits()) ? AtomicString(height().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::heightAttr) : nullAtom));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>