<!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>[190013] 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/190013">190013</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-09-19 02:59:47 -0700 (Sat, 19 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Null dereference loading Blink layout test svg/filters/feImage-failed-load-crash.html
https://bugs.webkit.org/show_bug.cgi?id=149316
<rdar://problem/22749532>
Reviewed by Tim Horton.
Source/WebCore:
If an feImage triggered loading a resource, and then was removed from the document,
we'd still try to notify its parent when the resource arrived (or failed).
Merge Blink commit:
https://chromium.googlesource.com/chromium/blink/+/9cbcfd7866bbaff0c4b3c4c8508b7c97b46d6e6a
Test: svg/filters/feImage-failed-load-crash.html
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::notifyFinished): Add a null check to the parent element
before sending the notification.
LayoutTests:
Merge Blink commit:
https://chromium.googlesource.com/chromium/blink/+/9cbcfd7866bbaff0c4b3c4c8508b7c97b46d6e6a
* svg/filters/feImage-failed-load-crash-expected.txt: Added.
* svg/filters/feImage-failed-load-crash.html: 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="#trunkSourceWebCoresvgSVGFEImageElementcpp">trunk/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgfiltersfeImagefailedloadcrashexpectedtxt">trunk/LayoutTests/svg/filters/feImage-failed-load-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgfiltersfeImagefailedloadcrashhtml">trunk/LayoutTests/svg/filters/feImage-failed-load-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190012 => 190013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-19 09:56:12 UTC (rev 190012)
+++ trunk/LayoutTests/ChangeLog 2015-09-19 09:59:47 UTC (rev 190013)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-09-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><ins>+ Null dereference loading Blink layout test svg/filters/feImage-failed-load-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=149316
+ <rdar://problem/22749532>
+
+ Reviewed by Tim Horton.
+
+ Merge Blink commit:
+ https://chromium.googlesource.com/chromium/blink/+/9cbcfd7866bbaff0c4b3c4c8508b7c97b46d6e6a
+
+ * svg/filters/feImage-failed-load-crash-expected.txt: Added.
+ * svg/filters/feImage-failed-load-crash.html: Added.
+
+2015-09-18 Dean Jackson <dino@apple.com>
+
</ins><span class="cx"> Null dereference loading Blink layout test svg/custom/use-href-attr-removal-crash.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149315
</span><span class="cx"> <rdar://problem/22749358>
</span></span></pre></div>
<a id="trunkLayoutTestssvgfiltersfeImagefailedloadcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/filters/feImage-failed-load-crash-expected.txt (0 => 190013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/filters/feImage-failed-load-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/filters/feImage-failed-load-crash-expected.txt 2015-09-19 09:59:47 UTC (rev 190013)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/filters/feImage-failed-load-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="trunkLayoutTestssvgfiltersfeImagefailedloadcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/filters/feImage-failed-load-crash.html (0 => 190013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/filters/feImage-failed-load-crash.html (rev 0)
+++ trunk/LayoutTests/svg/filters/feImage-failed-load-crash.html 2015-09-19 09:59:47 UTC (rev 190013)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<body>
+ <p id="a">This test passes if it does not crash.</p>
+ <svg>
+ <feImage id="feImage"></feImage>
+ </svg>
+ <script>
+ onload = function() {
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ var feImage = document.getElementById("feImage");
+ feImage.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", "#doesnotexist");
+ document.replaceChild(feImage, document.documentElement);
+ feImage.setAttribute("xlink:href", "doesnotexist.svg");
+ }
+ </script>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/filters/feImage-failed-load-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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190012 => 190013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-19 09:56:12 UTC (rev 190012)
+++ trunk/Source/WebCore/ChangeLog 2015-09-19 09:59:47 UTC (rev 190013)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-09-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><ins>+ Null dereference loading Blink layout test svg/filters/feImage-failed-load-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=149316
+ <rdar://problem/22749532>
+
+ Reviewed by Tim Horton.
+
+ If an feImage triggered loading a resource, and then was removed from the document,
+ we'd still try to notify its parent when the resource arrived (or failed).
+
+ Merge Blink commit:
+ https://chromium.googlesource.com/chromium/blink/+/9cbcfd7866bbaff0c4b3c4c8508b7c97b46d6e6a
+
+ Test: svg/filters/feImage-failed-load-crash.html
+
+ * svg/SVGFEImageElement.cpp:
+ (WebCore::SVGFEImageElement::notifyFinished): Add a null check to the parent element
+ before sending the notification.
+
+2015-09-18 Dean Jackson <dino@apple.com>
+
</ins><span class="cx"> Null dereference loading Blink layout test svg/custom/use-href-attr-removal-crash.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149315
</span><span class="cx"> <rdar://problem/22749358>
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (190012 => 190013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2015-09-19 09:56:12 UTC (rev 190012)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2015-09-19 09:59:47 UTC (rev 190013)
</span><span class="lines">@@ -167,9 +167,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Element* parent = parentElement();
</span><del>- ASSERT(parent);
</del><span class="cx">
</span><del>- if (!parent->hasTagName(SVGNames::filterTag))
</del><ins>+ if (!parent || !parent->hasTagName(SVGNames::filterTag))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderElement* parentRenderer = parent->renderer();
</span></span></pre>
</div>
</div>
</body>
</html>