<!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>[246833] branches/safari-608.1.31.0-branch/Source</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/246833">246833</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2019-06-25 23:53:29 -0700 (Tue, 25 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/246767">r246767</a>. rdar://problem/51535942

    Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
    <rdar://problem/51535942> and https://bugs.webkit.org/show_bug.cgi?id=199123

    Reviewed by Andy Estes.

    Source/WebCore:

    * loader/FrameLoaderStateMachine.h:
    (WebCore::FrameLoaderStateMachine::stateForDebugging const):

    Source/WebKit:

    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad): Properly detect this null DocumentLoader
      and try to learn more about the state of things.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246767 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6081310branchSourceWebCoreChangeLog">branches/safari-608.1.31.0-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6081310branchSourceWebCoreloaderFrameLoaderStateMachineh">branches/safari-608.1.31.0-branch/Source/WebCore/loader/FrameLoaderStateMachine.h</a></li>
<li><a href="#branchessafari6081310branchSourceWebKitChangeLog">branches/safari-608.1.31.0-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6081310branchSourceWebKitWebProcessWebCoreSupportWebFrameLoaderClientcpp">branches/safari-608.1.31.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6081310branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.31.0-branch/Source/WebCore/ChangeLog (246832 => 246833)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.31.0-branch/Source/WebCore/ChangeLog       2019-06-26 03:56:58 UTC (rev 246832)
+++ branches/safari-608.1.31.0-branch/Source/WebCore/ChangeLog  2019-06-26 06:53:29 UTC (rev 246833)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2019-06-25  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r246767. rdar://problem/51535942
+
+    Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
+    <rdar://problem/51535942> and https://bugs.webkit.org/show_bug.cgi?id=199123
+    
+    Reviewed by Andy Estes.
+    
+    Source/WebCore:
+    
+    * loader/FrameLoaderStateMachine.h:
+    (WebCore::FrameLoaderStateMachine::stateForDebugging const):
+    
+    Source/WebKit:
+    
+    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+    (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad): Properly detect this null DocumentLoader
+      and try to learn more about the state of things.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246767 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-06-24  Brady Eidson  <beidson@apple.com>
+
+            Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
+            <rdar://problem/51535942> and https://bugs.webkit.org/show_bug.cgi?id=199123
+
+            Reviewed by Andy Estes.
+
+            * loader/FrameLoaderStateMachine.h:
+            (WebCore::FrameLoaderStateMachine::stateForDebugging const):
+
</ins><span class="cx"> 2019-06-24  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Revert r246530. rdar://problem/52020968
</span></span></pre></div>
<a id="branchessafari6081310branchSourceWebCoreloaderFrameLoaderStateMachineh"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.31.0-branch/Source/WebCore/loader/FrameLoaderStateMachine.h (246832 => 246833)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.31.0-branch/Source/WebCore/loader/FrameLoaderStateMachine.h        2019-06-26 03:56:58 UTC (rev 246832)
+++ branches/safari-608.1.31.0-branch/Source/WebCore/loader/FrameLoaderStateMachine.h   2019-06-26 06:53:29 UTC (rev 246833)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx">     WEBCORE_EXPORT bool firstLayoutDone() const;
</span><span class="cx">     void advanceTo(State);
</span><span class="cx"> 
</span><ins>+    State stateForDebugging() const { return m_state; }
+
</ins><span class="cx"> private:
</span><span class="cx">     State m_state;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6081310branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.31.0-branch/Source/WebKit/ChangeLog (246832 => 246833)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.31.0-branch/Source/WebKit/ChangeLog        2019-06-26 03:56:58 UTC (rev 246832)
+++ branches/safari-608.1.31.0-branch/Source/WebKit/ChangeLog   2019-06-26 06:53:29 UTC (rev 246833)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2019-06-25  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r246767. rdar://problem/51535942
+
+    Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
+    <rdar://problem/51535942> and https://bugs.webkit.org/show_bug.cgi?id=199123
+    
+    Reviewed by Andy Estes.
+    
+    Source/WebCore:
+    
+    * loader/FrameLoaderStateMachine.h:
+    (WebCore::FrameLoaderStateMachine::stateForDebugging const):
+    
+    Source/WebKit:
+    
+    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+    (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad): Properly detect this null DocumentLoader
+      and try to learn more about the state of things.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246767 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-06-24  Brady Eidson  <beidson@apple.com>
+
+            Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
+            <rdar://problem/51535942> and https://bugs.webkit.org/show_bug.cgi?id=199123
+
+            Reviewed by Andy Estes.
+
+            * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+            (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad): Properly detect this null DocumentLoader
+              and try to learn more about the state of things.
+
</ins><span class="cx"> 2019-06-24  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Revert r246530. rdar://problem/52020968
</span></span></pre></div>
<a id="branchessafari6081310branchSourceWebKitWebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.31.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (246832 => 246833)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.31.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp       2019-06-26 03:56:58 UTC (rev 246832)
+++ branches/safari-608.1.31.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp  2019-06-26 06:53:29 UTC (rev 246833)
</span><span class="lines">@@ -311,16 +311,21 @@
</span><span class="cx">     if (!webPage)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().provisionalDocumentLoader());
</del><ins>+    WebDocumentLoader* documentLoader = static_cast<WebDocumentLoader*>(m_frame->coreFrame()->loader().provisionalDocumentLoader());
+    if (!documentLoader) {
+        RELEASE_LOG_FAULT(Loading, "WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad called with no provisional DocumentLoader. FrameState is %i. FrameLoaderStateMachine stateForDebugging - %i", m_frame->coreFrame()->loader().state(), m_frame->coreFrame()->loader().stateMachine().stateForDebugging());
+        return;
+    }
+
</ins><span class="cx">     RefPtr<API::Object> userData;
</span><span class="cx"> 
</span><del>-    LOG(Loading, "WebProcess %i - dispatchDidReceiveServerRedirectForProvisionalLoad to request url %s", getCurrentProcessID(), documentLoader.request().url().string().utf8().data());
</del><ins>+    LOG(Loading, "WebProcess %i - dispatchDidReceiveServerRedirectForProvisionalLoad to request url %s", getCurrentProcessID(), documentLoader->request().url().string().utf8().data());
</ins><span class="cx"> 
</span><span class="cx">     // Notify the bundle client.
</span><span class="cx">     webPage->injectedBundleLoaderClient().didReceiveServerRedirectForProvisionalLoadForFrame(*webPage, *m_frame, userData);
</span><span class="cx"> 
</span><span class="cx">     // Notify the UIProcess.
</span><del>-    webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.request(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+    webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader->navigationID(), documentLoader->request(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidChangeProvisionalURL()
</span></span></pre>
</div>
</div>

</body>
</html>