<!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>[195055] releases/WebKitGTK/webkit-2.10</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/195055">195055</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-14 06:22:55 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192947">r192947</a> - Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
https://bugs.webkit.org/show_bug.cgi?id=149305
<rdar://problem/22747892>
Reviewed by Brent Fulgham.
Source/WebCore:
Add an extra guard to replaceDocument() against rude JS in unload event handlers.
Test: fast/loader/unload-mutation-crash.html
* loader/DocumentWriter.cpp:
(WebCore::DocumentWriter::replaceDocument):
(WebCore::DocumentWriter::begin):
LayoutTests:
This test case is from Blink <a href="http://trac.webkit.org/projects/webkit/changeset/180918">r180918</a>:
https://codereview.chromium.org/495743003
* fast/loader/unload-mutation-crash-expected.txt: Added.
* fast/loader/unload-mutation-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreloaderDocumentWritercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/DocumentWriter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastloaderunloadmutationcrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastloaderunloadmutationcrashhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195054 => 195055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-14 13:59:18 UTC (rev 195054)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-14 14:22:55 UTC (rev 195055)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-02 Jiewen Tan <jiewen_tan@apple.com>
+
+ Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=149305
+ <rdar://problem/22747892>
+
+ Reviewed by Brent Fulgham.
+
+ This test case is from Blink r180918:
+ https://codereview.chromium.org/495743003
+
+ * fast/loader/unload-mutation-crash-expected.txt: Added.
+ * fast/loader/unload-mutation-crash.html: Added.
+
</ins><span class="cx"> 2015-11-30 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Amazon.com Additional Information links aren't clickable
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastloaderunloadmutationcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash-expected.txt (0 => 195055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash-expected.txt 2016-01-14 14:22:55 UTC (rev 195055)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS. WebKit didn't crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastloaderunloadmutationcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash.html (0 => 195055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/loader/unload-mutation-crash.html 2016-01-14 14:22:55 UTC (rev 195055)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+function start() {
+ window.firstFrame = document.createElement('iframe');
+ document.body.appendChild(window.firstFrame);
+ window.secondFrame = document.createElement('iframe');
+ window.secondFrame.src = 'javascript:window.top.maybeStart();';
+ window.firstFrame.contentDocument.documentElement.appendChild(window.secondFrame);
+}
+
+function maybeStart() {
+ window.secondFrame.contentWindow.onunload = function() {
+ document.documentElement.removeChild(window.bodyEl);
+ };
+
+ window.firstFrame.src = 'javascript:"";';
+ document.write("PASS. WebKit didn't crash.");
+}
+</script>
+</head>
+<body id=bodyEl onload=start()></body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195054 => 195055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-14 13:59:18 UTC (rev 195054)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-14 14:22:55 UTC (rev 195055)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-02 Jiewen Tan <jiewen_tan@apple.com>
+
+ Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=149305
+ <rdar://problem/22747892>
+
+ Reviewed by Brent Fulgham.
+
+ Add an extra guard to replaceDocument() against rude JS in unload event handlers.
+
+ Test: fast/loader/unload-mutation-crash.html
+
+ * loader/DocumentWriter.cpp:
+ (WebCore::DocumentWriter::replaceDocument):
+ (WebCore::DocumentWriter::begin):
+
</ins><span class="cx"> 2015-12-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] ASSERTION FAILED: m_table running /webkit2/BackForwardList/navigation in Debug build
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreloaderDocumentWritercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/DocumentWriter.cpp (195054 => 195055)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/DocumentWriter.cpp 2016-01-14 13:59:18 UTC (rev 195054)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/DocumentWriter.cpp 2016-01-14 14:22:55 UTC (rev 195055)
</span><span class="lines">@@ -73,6 +73,11 @@
</span><span class="cx"> m_frame->loader().stopAllLoaders();
</span><span class="cx"> begin(m_frame->document()->url(), true, ownerDocument);
</span><span class="cx">
</span><ins>+ // begin() might fire an unload event, which will result in a situation where no new document has been attached,
+ // and the old document has been detached. Therefore, bail out if no document is attached.
+ if (!m_frame->document())
+ return;
+
</ins><span class="cx"> if (!source.isNull()) {
</span><span class="cx"> if (!m_hasReceivedSomeData) {
</span><span class="cx"> m_hasReceivedSomeData = true;
</span><span class="lines">@@ -141,6 +146,11 @@
</span><span class="cx"> m_frame->loader().clear(document.ptr(), !shouldReuseDefaultView, !shouldReuseDefaultView);
</span><span class="cx"> clear();
</span><span class="cx">
</span><ins>+ // m_frame->loader().clear() might fire unload event which could remove the view of the document.
+ // Bail out if document has no view.
+ if (!document->view())
+ return;
+
</ins><span class="cx"> if (!shouldReuseDefaultView)
</span><span class="cx"> m_frame->script().updatePlatformScriptObjects();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>