<!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>[288215] 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/288215">288215</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2022-01-19 10:16:22 -0800 (Wed, 19 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Null check m_progressTracker in clearProvisionalLoad
https://bugs.webkit.org/show_bug.cgi?id=233063

Patch by Rob Buis <rbuis@igalia.com> on 2022-01-19
Reviewed by Alex Christensen.

Source/WebCore:

Null check m_progressTracker in clearProvisionalLoad.

Test: fast/frames/contentFrame-disconnecting-crash.html

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::clearProvisionalLoad):

LayoutTests:

* platform/mac/fast/frames/contentFrame-disconnecting-crash-expected.txt: Added.
* platform/mac/fast/frames/contentFrame-disconnecting-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="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfastframescontentFramedisconnectingcrashexpectedtxt">trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastframescontentFramedisconnectingcrashhtml">trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (288214 => 288215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2022-01-19 18:07:36 UTC (rev 288214)
+++ trunk/LayoutTests/ChangeLog 2022-01-19 18:16:22 UTC (rev 288215)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2022-01-19  Rob Buis  <rbuis@igalia.com>
+
+        Null check m_progressTracker in clearProvisionalLoad
+        https://bugs.webkit.org/show_bug.cgi?id=233063
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac/fast/frames/contentFrame-disconnecting-crash-expected.txt: Added.
+        * platform/mac/fast/frames/contentFrame-disconnecting-crash.html: Added.
+
</ins><span class="cx"> 2022-01-19  Alexey Shvayka  <ashvayka@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Callback functions / interfaces should use global object of its _value_ for errors and lifecycle
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastframescontentFramedisconnectingcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash-expected.txt (0 => 288215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash-expected.txt                         (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash-expected.txt    2022-01-19 18:16:22 UTC (rev 288215)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS: There was no crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastframescontentFramedisconnectingcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash.html (0 => 288215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash.html                         (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/frames/contentFrame-disconnecting-crash.html    2022-01-19 18:16:22 UTC (rev 288215)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<script>
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+  onload = () => {
+    let img = document.createElement('img');
+    img.onerror = () => {
+      document.execCommand('Undo');
+      document.write('PASS: There was no crash.');
+      testRunner.notifyDone();
+    };
+    img.src = 'data:';
+    document.designMode = 'on';
+    document.execCommand('SelectAll');
+    document.execCommand('InsertImage', false, '#');
+    document.execCommand('SelectAll');
+    document.execCommand('Bold');
+    document.execCommand('Italic');
+    let embed = document.createElement('embed');
+    document.querySelector('i').appendChild(embed);
+    embed.src = 'data:';
+  };
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (288214 => 288215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2022-01-19 18:07:36 UTC (rev 288214)
+++ trunk/Source/WebCore/ChangeLog      2022-01-19 18:16:22 UTC (rev 288215)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2022-01-19  Rob Buis  <rbuis@igalia.com>
+
+        Null check m_progressTracker in clearProvisionalLoad
+        https://bugs.webkit.org/show_bug.cgi?id=233063
+
+        Reviewed by Alex Christensen.
+
+        Null check m_progressTracker in clearProvisionalLoad.
+
+        Test: fast/frames/contentFrame-disconnecting-crash.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::clearProvisionalLoad):
+
</ins><span class="cx"> 2022-01-19  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Improve computation of service worker FetchEvent.resultingClientId
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (288214 => 288215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp      2022-01-19 18:07:36 UTC (rev 288214)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2022-01-19 18:16:22 UTC (rev 288215)
</span><span class="lines">@@ -1998,7 +1998,8 @@
</span><span class="cx"> {
</span><span class="cx">     FRAMELOADER_RELEASE_LOG(ResourceLoading, "clearProvisionalLoad: Clearing provisional document loader (m_provisionalDocumentLoader=%p)", m_provisionalDocumentLoader.get());
</span><span class="cx">     setProvisionalDocumentLoader(nullptr);
</span><del>-    m_progressTracker->progressCompleted();
</del><ins>+    if (m_progressTracker)
+        m_progressTracker->progressCompleted();
</ins><span class="cx">     setState(FrameState::Complete);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>