<!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>[174970] releases/WebKitGTK/webkit-2.6</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/174970">174970</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 09:06:35 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174684">r174684</a> - [XHR] Abort method execution when m_loader->cancel() in internalAbort() caused reentry
https://bugs.webkit.org/show_bug.cgi?id=126975
Patch by Youenn Fablet <youennf@gmail.com> on 2014-10-14
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Merging https://chromium.googlesource.com/chromium/blink/+/0d75daf2053631518606ae15daaece701a25b2c4
Ensuring new test from https://codereview.chromium.org/76133002/ is passing.
Test: http/tests/xmlhttprequest/reentrant-cancel-abort.html
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::open): exit early if internalAbort asks so
(WebCore::XMLHttpRequest::abort): exit early if internalAbort asks so
(WebCore::XMLHttpRequest::internalAbort): ask calling function to exit early if a new loader is created during the cancellation of the loader (potential reentrant case through window.onload callback)
(WebCore::XMLHttpRequest::didTimeout): exit early if internalAbort asks so
* xml/XMLHttpRequest.h:
LayoutTests:
Adding reentrant-cancel-abort.html (from https://codereview.chromium.org/76133002/)
that crashes without the patch
Updated reentrant-cancel.html test to expect the exception
that is now hit in initSend function (since a XHR open() call is aborted)
* http/tests/xmlhttprequest/reentrant-cancel-abort-expected.txt: Added.
* http/tests/xmlhttprequest/reentrant-cancel-abort.html: Added.
* http/tests/xmlhttprequest/reentrant-cancel.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestreentrantcancelhtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorexmlXMLHttpRequestcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorexmlXMLHttpRequesth">releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestreentrantcancelabortexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestreentrantcancelaborthtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (174969 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 16:03:28 UTC (rev 174969)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-14 Youenn Fablet <youennf@gmail.com>
+
+ [XHR] Abort method execution when m_loader->cancel() in internalAbort() caused reentry
+ https://bugs.webkit.org/show_bug.cgi?id=126975
+
+ Reviewed by Alexey Proskuryakov.
+
+ Adding reentrant-cancel-abort.html (from https://codereview.chromium.org/76133002/)
+ that crashes without the patch
+ Updated reentrant-cancel.html test to expect the exception
+ that is now hit in initSend function (since a XHR open() call is aborted)
+
+ * http/tests/xmlhttprequest/reentrant-cancel-abort-expected.txt: Added.
+ * http/tests/xmlhttprequest/reentrant-cancel-abort.html: Added.
+ * http/tests/xmlhttprequest/reentrant-cancel.html:
+
</ins><span class="cx"> 2014-10-09 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Computed style for clip is wrong with respect to auto
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestreentrantcancelabortexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort-expected.txt (0 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort-expected.txt 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+insertedText
+Reentrancy, cancellation and explicit abort. Check that we don't crash and report the expected abort event.
+DOMContentLoaded
+PASS
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestreentrantcancelaborthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort.html (0 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-abort.html 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!doctype html>
+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+function log(str)
+{
+ document.body.appendChild(document.createTextNode(str));
+ document.body.appendChild(document.createElement("br"));
+}
+
+function addElement(e)
+{
+ var txt = (e && e.type) || "insertedText";
+ log(txt);
+}
+document.addEventListener("DOMContentLoaded", addElement, false);
+
+var abortDispatched = false;
+function reportResult()
+{
+ log(abortDispatched ? "PASS" : "FAIL");
+ testRunner.notifyDone();
+}
+
+window.onload = function () {
+ xhr.open("GET", "", true);
+ setTimeout(reportResult, 100);
+};
+
+var xhr = new XMLHttpRequest();
+xhr.onabort = function () {
+ abortDispatched = true;
+};
+
+function sendAndAbort()
+{
+ xhr.open("GET", "", true);
+ xhr.send();
+ xhr.abort();
+}
+window.addEventListener("DOMSubtreeModified", sendAndAbort);
+addElement();
+</script>
+Reentrancy, cancellation and explicit abort. Check that we don't crash
+and report the expected abort event.<br/>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestreentrantcancelhtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel.html (174969 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel.html 2014-10-21 16:03:28 UTC (rev 174969)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/reentrant-cancel.html 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> <script>
</span><del>-if (window.testRunner)
</del><ins>+if (window.testRunner) {
</ins><span class="cx"> testRunner.dumpAsText();
</span><ins>+ testRunner.waitUntilDone();
+}
</ins><span class="cx">
</span><span class="cx"> function addElement() {
</span><span class="cx"> document.documentElement.appendChild(document.createTextNode('X'));
</span><span class="lines">@@ -12,7 +14,17 @@
</span><span class="cx"> function sendXHR()
</span><span class="cx"> {
</span><span class="cx"> xhr.open("GET", "", true);
</span><del>- xhr.send();
</del><ins>+ try {
+ xhr.send();
+ }
+ catch(e) {
+ // In case of reentrant call, the call to "open" will be aborted by reentrant call.
+ // The call to "send" following the "open" aborted call will throw an exception (XHR not in open mode)
+ if (e.name != "InvalidStateError") {
+ console.log("FAILED: Was expecting an InvalidStateError exception");
+ }
+ testRunner.notifyDone();
+ }
</ins><span class="cx"> }
</span><span class="cx"> window.addEventListener("DOMSubtreeModified", sendXHR);
</span><span class="cx"> addElement();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174969 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:03:28 UTC (rev 174969)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-10-14 Youenn Fablet <youennf@gmail.com>
+
+ [XHR] Abort method execution when m_loader->cancel() in internalAbort() caused reentry
+ https://bugs.webkit.org/show_bug.cgi?id=126975
+
+ Reviewed by Alexey Proskuryakov.
+
+ Merging https://chromium.googlesource.com/chromium/blink/+/0d75daf2053631518606ae15daaece701a25b2c4
+ Ensuring new test from https://codereview.chromium.org/76133002/ is passing.
+
+ Test: http/tests/xmlhttprequest/reentrant-cancel-abort.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::open): exit early if internalAbort asks so
+ (WebCore::XMLHttpRequest::abort): exit early if internalAbort asks so
+ (WebCore::XMLHttpRequest::internalAbort): ask calling function to exit early if a new loader is created during the cancellation of the loader (potential reentrant case through window.onload callback)
+ (WebCore::XMLHttpRequest::didTimeout): exit early if internalAbort asks so
+ * xml/XMLHttpRequest.h:
+
</ins><span class="cx"> 2014-10-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert part of r174543 that broke grid layout tests.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.cpp (174969 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.cpp 2014-10-21 16:03:28 UTC (rev 174969)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.cpp 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -463,7 +463,9 @@
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::open(const String& method, const URL& url, bool async, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- internalAbort();
</del><ins>+ if (!internalAbort())
+ return;
+
</ins><span class="cx"> State previousState = m_state;
</span><span class="cx"> m_state = UNSENT;
</span><span class="cx"> m_error = false;
</span><span class="lines">@@ -805,7 +807,8 @@
</span><span class="cx">
</span><span class="cx"> bool sendFlag = m_loader;
</span><span class="cx">
</span><del>- internalAbort();
</del><ins>+ if (!internalAbort())
+ return;
</ins><span class="cx">
</span><span class="cx"> clearResponseBuffers();
</span><span class="cx">
</span><span class="lines">@@ -823,26 +826,35 @@
</span><span class="cx"> dispatchErrorEvents(eventNames().abortEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void XMLHttpRequest::internalAbort()
</del><ins>+bool XMLHttpRequest::internalAbort()
</ins><span class="cx"> {
</span><del>- bool hadLoader = m_loader;
-
</del><span class="cx"> m_error = true;
</span><span class="cx">
</span><span class="cx"> // FIXME: when we add the support for multi-part XHR, we will have to think be careful with this initialization.
</span><span class="cx"> m_receivedLength = 0;
</span><span class="cx">
</span><del>- if (hadLoader) {
- m_loader->cancel();
- m_loader = 0;
- }
-
</del><span class="cx"> m_decoder = 0;
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didFailXHRLoading(scriptExecutionContext(), this);
</span><span class="cx">
</span><del>- if (hadLoader)
- dropProtection();
</del><ins>+ if (!m_loader)
+ return true;
+
+ // Cancelling m_loader may trigger a window.onload callback which can call open() on the same xhr.
+ // This would create internalAbort reentrant call.
+ // m_loader is set to null before being cancelled to exit early in any reentrant internalAbort() call.
+ RefPtr<ThreadableLoader> loader = m_loader.release();
+ loader->cancel();
+
+ // If window.onload callback calls open() and send() on the same xhr, m_loader is now set to a new value.
+ // The function calling internalAbort() should abort to let the open() and send() calls continue properly.
+ // We ask the function calling internalAbort() to exit by returning false.
+ // Save this information to a local variable since we are going to drop protection.
+ bool newLoadStarted = m_loader;
+
+ dropProtection();
+
+ return !newLoadStarted;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::clearResponse()
</span><span class="lines">@@ -1218,7 +1230,8 @@
</span><span class="cx"> {
</span><span class="cx"> // internalAbort() calls dropProtection(), which may release the last reference.
</span><span class="cx"> Ref<XMLHttpRequest> protect(*this);
</span><del>- internalAbort();
</del><ins>+ if (!internalAbort())
+ return;
</ins><span class="cx">
</span><span class="cx"> clearResponse();
</span><span class="cx"> clearRequest();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.h (174969 => 174970)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.h 2014-10-21 16:03:28 UTC (rev 174969)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/xml/XMLHttpRequest.h 2014-10-21 16:06:35 UTC (rev 174970)
</span><span class="lines">@@ -194,7 +194,11 @@
</span><span class="cx"> void changeState(State newState);
</span><span class="cx"> void callReadyStateChangeListener();
</span><span class="cx"> void dropProtection();
</span><del>- void internalAbort();
</del><ins>+
+ // Returns false when cancelling the loader within internalAbort() triggers an event whose callback creates a new loader.
+ // In that case, the function calling internalAbort should exit.
+ bool internalAbort();
+
</ins><span class="cx"> void clearResponse();
</span><span class="cx"> void clearResponseBuffers();
</span><span class="cx"> void clearRequest();
</span></span></pre>
</div>
</div>
</body>
</html>