<!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>[200998] branches/safari-601-branch</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/200998">200998</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 22:35:38 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/200986">r200986</a>. rdar://problem/26300514</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloaderFrameLoadercpp">branches/safari-601-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastframescrashduringiframeloadstopexpectedtxt">branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastframescrashduringiframeloadstophtml">branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastframesresourcescrashduringiframeloadstopinnerhtml">branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop-inner.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastframesresourcescrashduringiframeloadstophtml">branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (200997 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-05-17 05:31:35 UTC (rev 200997)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-16 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200986.
+
+ 2016-05-16 Brent Fulgham <bfulgham@apple.com>
+
+ heap use-after-free at WebCore::TimerBase::heapPopMin()
+ https://bugs.webkit.org/show_bug.cgi?id=157742
+ <rdar://problem/26236778>
+
+ Reviewed by Simon Fraser.
+
+ * fast/frames/crash-during-iframe-load-stop-expected.txt: Added.
+ * fast/frames/crash-during-iframe-load-stop.html: Added.
+ * fast/frames/resources/crash-during-iframe-load-stop-inner.html: Added.
+ * fast/frames/resources/crash-during-iframe-load-stop.html: Added.
+
</ins><span class="cx"> 2016-05-13 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r194403. rdar://problem/26274768
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastframescrashduringiframeloadstopexpectedtxtfromrev200986trunkLayoutTestsfastframescrashduringiframeloadstopexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop-expected.txt (from rev 200986, trunk/LayoutTests/fast/frames/crash-during-iframe-load-stop-expected.txt) (0 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop-expected.txt 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This tests that WebKit does not crash when frame loads are interrupted. This test passes if it does not crash.
+
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastframescrashduringiframeloadstophtmlfromrev200986trunkLayoutTestsfastframescrashduringiframeloadstophtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop.html (from rev 200986, trunk/LayoutTests/fast/frames/crash-during-iframe-load-stop.html) (0 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/frames/crash-during-iframe-load-stop.html 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<html>
+<head>
+<script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ var count = 0;
+</script>
+</head>
+<body onload='deleteFrame()'>
+ <script>
+ function deleteFrame()
+ {
+ var frameToRemove = document.getElementById('subframe');
+ document.body.removeChild(frameToRemove);
+ }
+
+ function reloadSubframe()
+ {
+ var iframe = document.createElement('iframe');
+ iframe.id = 'subframe';
+ iframe.src = 'resources/crash-during-iframe-load-stop.html';
+ document.body.appendChild(iframe);
+ setTimeout(function() { deleteFrame(); }, 0);
+ }
+
+ function subFrameFinishedLoading()
+ {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ </script>
+ <p>This tests that WebKit does not crash when frame loads are interrupted. This test passes if it does not crash.</p>
+ <iframe id="subframe" src='resources/crash-during-iframe-load-stop.html'></iframe>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastframesresourcescrashduringiframeloadstopinnerhtmlfromrev200986trunkLayoutTestsfastframesresourcescrashduringiframeloadstopinnerhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop-inner.html (from rev 200986, trunk/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop-inner.html) (0 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop-inner.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop-inner.html 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<html>
+ <script>
+ window.parent.stop();
+ window.parent.subFrameFinishedLoading();
+ </script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastframesresourcescrashduringiframeloadstophtmlfromrev200986trunkLayoutTestsfastframesresourcescrashduringiframeloadstophtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop.html (from rev 200986, trunk/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop.html) (0 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/frames/resources/crash-during-iframe-load-stop.html 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<html>
+<head>
+ <script>
+ function subFrameFinishedLoading()
+ {
+ window.parent.count = window.parent.count + 1;
+ if (window.parent.count < 10)
+ window.parent.reloadSubframe();
+ else
+ window.parent.subFrameFinishedLoading();
+ }
+ </script>
+</head>
+ <iframe src="crash-during-iframe-load-stop-inner.html"></iframe>
+ <iframe src="data:text/html, <html></html>"></iframe>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (200997 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-05-17 05:31:35 UTC (rev 200997)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-16 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200986.
+
+ 2016-05-16 Brent Fulgham <bfulgham@apple.com>
+
+ heap use-after-free at WebCore::TimerBase::heapPopMin()
+ https://bugs.webkit.org/show_bug.cgi?id=157742
+ <rdar://problem/26236778>
+
+ Reviewed by David Kilzer.
+
+ Tested by fast/frames/resources/crash-during-iframe-load-stop.html.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopForUserCancel): Protect m_frame from destruction while it is still
+ being used by the current stack frame.
+ (WebCore::FrameLoader::frameDetached): Ditto.
+ (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): Ditto.
+
</ins><span class="cx"> 2016-05-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after r195004/r200780.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/FrameLoader.cpp (200997 => 200998)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/FrameLoader.cpp 2016-05-17 05:31:35 UTC (rev 200997)
+++ branches/safari-601-branch/Source/WebCore/loader/FrameLoader.cpp 2016-05-17 05:35:38 UTC (rev 200998)
</span><span class="lines">@@ -1618,6 +1618,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::stopForUserCancel(bool deferCheckLoadComplete)
</span><span class="cx"> {
</span><ins>+ // Calling stopAllLoaders can cause the frame to be deallocated, including the frame loader.
+ Ref<Frame> protectedFrame(m_frame);
+
</ins><span class="cx"> stopAllLoaders();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -2471,6 +2474,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::frameDetached()
</span><span class="cx"> {
</span><ins>+ // Calling stopAllLoaders can cause the frame to be deallocated, including the frame loader.
+ Ref<Frame> protectedFrame(m_frame);
+
</ins><span class="cx"> stopAllLoaders();
</span><span class="cx"> m_frame.document()->stopActiveDOMObjects();
</span><span class="cx"> detachFromParent();
</span><span class="lines">@@ -2766,6 +2772,10 @@
</span><span class="cx"> if (!shouldContinue)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Calling stopLoading() on the provisional document loader can cause the underlying
+ // frame to be deallocated.
+ Ref<Frame> protectedFrame(m_frame);
+
</ins><span class="cx"> // If we have a provisional request for a different document, a fragment scroll should cancel it.
</span><span class="cx"> if (m_provisionalDocumentLoader && !equalIgnoringFragmentIdentifier(m_provisionalDocumentLoader->request().url(), request.url())) {
</span><span class="cx"> m_provisionalDocumentLoader->stopLoading();
</span></span></pre>
</div>
</div>
</body>
</html>