<!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>[159481] 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/159481">159481</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2013-11-18 22:01:45 -0800 (Mon, 18 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>use after free in WebCore::DocumentOrderedMap::remove / WebCore::TreeScope::removeElementById
https://bugs.webkit.org/show_bug.cgi?id=121324

Reviewed by Ryosuke Niwa.

Update the document ordered map for an image element before dispatching load or error events
when it's inserted into a document.

Source/WebCore:

Test: fast/dom/modify-node-and-while-in-the-callback-too-crash.html

* dom/DocumentOrderedMap.cpp: defensive fix to avoid use after free issues.
(WebCore::DocumentOrderedMap::remove):
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::insertedInto):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement): setting m_failedLoadURL makes
repeated updateFromElement calls return early.

LayoutTests:

* fast/dom/modify-node-and-while-in-the-callback-too-crash-expected.txt: Added.
* fast/dom/modify-node-and-while-in-the-callback-too-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="#trunkSourceWebCoredomDocumentOrderedMapcpp">trunk/Source/WebCore/dom/DocumentOrderedMap.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdommodifynodeandwhileinthecallbacktoocrashexpectedtxt">trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdommodifynodeandwhileinthecallbacktoocrashhtml">trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159480 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-11-19 05:14:36 UTC (rev 159480)
+++ trunk/LayoutTests/ChangeLog        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-11-18  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        use after free in WebCore::DocumentOrderedMap::remove / WebCore::TreeScope::removeElementById
+        https://bugs.webkit.org/show_bug.cgi?id=121324
+
+        Reviewed by Ryosuke Niwa.
+
+        Update the document ordered map for an image element before dispatching load or error events
+        when it's inserted into a document.
+
+        * fast/dom/modify-node-and-while-in-the-callback-too-crash-expected.txt: Added.
+        * fast/dom/modify-node-and-while-in-the-callback-too-crash.html: Added.
+
</ins><span class="cx"> 2013-11-18  Sun-woo Nam  &lt;sunny.nam@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL] Layout tests need to be rebaselined.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdommodifynodeandwhileinthecallbacktoocrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash-expected.txt (0 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash-expected.txt        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This tests that making changes on a node that triggers a callback where we make changes again on the same node does not result in an assert/crash. Test passes if no crash is observed.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdommodifynodeandwhileinthecallbacktoocrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash.html (0 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/dom/modify-node-and-while-in-the-callback-too-crash.html        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+    &lt;p&gt;This tests that making changes on a node that triggers a callback where we make changes 
+    again on the same node does not result in an assert/crash.
+    Test passes if no crash is observed.&lt;/p&gt;  
+    &lt;img id=&quot;error-image&quot; src=&quot;&quot;&gt;
+    &lt;div id=&quot;container&quot;&gt;&lt;/div&gt;
+
+    &lt;script&gt; 
+        if (window.testRunner)
+            testRunner.dumpAsText();
+        
+        var img = document.getElementById('error-image');
+        var container = document.getElementById('container');
+
+        img.onerror = function() { 
+            container.parentNode.removeChild(container);
+        }
+        
+        container.appendChild(img);
+    &lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159480 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-19 05:14:36 UTC (rev 159480)
+++ trunk/Source/WebCore/ChangeLog        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-11-18  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        use after free in WebCore::DocumentOrderedMap::remove / WebCore::TreeScope::removeElementById
+        https://bugs.webkit.org/show_bug.cgi?id=121324
+
+        Reviewed by Ryosuke Niwa.
+
+        Update the document ordered map for an image element before dispatching load or error events
+        when it's inserted into a document.
+
+        Test: fast/dom/modify-node-and-while-in-the-callback-too-crash.html
+
+        * dom/DocumentOrderedMap.cpp: defensive fix to avoid use after free issues.
+        (WebCore::DocumentOrderedMap::remove):
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::insertedInto):
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::updateFromElement): setting m_failedLoadURL makes
+        repeated updateFromElement calls return early.
+
</ins><span class="cx"> 2013-11-18  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Upstream iOS's ResourceHandle implementation
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentOrderedMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentOrderedMap.cpp (159480 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentOrderedMap.cpp        2013-11-19 05:14:36 UTC (rev 159480)
+++ trunk/Source/WebCore/dom/DocumentOrderedMap.cpp        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx">     m_map.checkConsistency();
</span><span class="cx">     auto it = m_map.find(&amp;key);
</span><span class="cx">     ASSERT(it != m_map.end());
</span><ins>+    if (it == m_map.end())
+        return;
+
</ins><span class="cx">     MapEntry&amp; entry = it-&gt;value;
</span><span class="cx"> 
</span><span class="cx">     ASSERT(entry.count);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (159480 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp        2013-11-19 05:14:36 UTC (rev 159480)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -221,12 +221,16 @@
</span><span class="cx">     if (insertionPoint.inDocument() &amp;&amp; !m_lowercasedUsemap.isNull())
</span><span class="cx">         document().addImageElementByLowercasedUsemap(*m_lowercasedUsemap.impl(), *this);
</span><span class="cx"> 
</span><ins>+    // Insert needs to complete first, before we start updating the loader. Loader dispatches events which could result
+    // in callbacks back to this node.
+    Node::InsertionNotificationRequest insertNotificationRequest = HTMLElement::insertedInto(insertionPoint);
+
</ins><span class="cx">     // If we have been inserted from a renderer-less document,
</span><span class="cx">     // our loader may have not fetched the image, so do it now.
</span><span class="cx">     if (insertionPoint.inDocument() &amp;&amp; !m_imageLoader.image())
</span><span class="cx">         m_imageLoader.updateFromElement();
</span><span class="cx"> 
</span><del>-    return HTMLElement::insertedInto(insertionPoint);
</del><ins>+    return insertNotificationRequest;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HTMLImageElement::removedFrom(ContainerNode&amp; insertionPoint)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (159480 => 159481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp        2013-11-19 05:14:36 UTC (rev 159480)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp        2013-11-19 06:01:45 UTC (rev 159481)
</span><span class="lines">@@ -212,8 +212,9 @@
</span><span class="cx">             clearFailedLoadURL();
</span><span class="cx">     } else if (!attr.isNull()) {
</span><span class="cx">         // Fire an error event if the url is empty.
</span><del>-        // FIXME: Should we fire this event asynchronoulsy via errorEventSender()?
-        m_element-&gt;dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</del><ins>+        m_failedLoadURL = attr;
+        m_hasPendingErrorEvent = true;
+        errorEventSender().dispatchEventSoon(this);
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     CachedImage* oldImage = m_image.get();
</span></span></pre>
</div>
</div>

</body>
</html>