Title: [280848] branches/safari-611.3.10.0-branch/Source/WebKit
- Revision
- 280848
- Author
- repst...@apple.com
- Date
- 2021-08-10 10:08:15 -0700 (Tue, 10 Aug 2021)
Log Message
Cherry-pick r279254. rdar://problem/80635931
Crash in WebFrameLoaderClient::dispatchDidStartProvisionalLoad after provisionalLoader is gone.
https://bugs.webkit.org/show_bug.cgi?id=226979
Patch by Venky Dass <yaranamavenkataram...@apple.com> on 2021-06-24
Reviewed by Ryosuke Niwa.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279254 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611.3.10.0-branch/Source/WebKit/ChangeLog (280847 => 280848)
--- branches/safari-611.3.10.0-branch/Source/WebKit/ChangeLog 2021-08-10 17:08:11 UTC (rev 280847)
+++ branches/safari-611.3.10.0-branch/Source/WebKit/ChangeLog 2021-08-10 17:08:15 UTC (rev 280848)
@@ -1,3 +1,28 @@
+2021-08-10 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r279254. rdar://problem/80635931
+
+ Crash in WebFrameLoaderClient::dispatchDidStartProvisionalLoad after provisionalLoader is gone.
+ https://bugs.webkit.org/show_bug.cgi?id=226979
+
+ Patch by Venky Dass <yaranamavenkataram...@apple.com> on 2021-06-24
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279254 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-06-24 Venky Dass <yaranamavenkataram...@apple.com>
+
+ Crash in WebFrameLoaderClient::dispatchDidStartProvisionalLoad after provisionalLoader is gone.
+ https://bugs.webkit.org/show_bug.cgi?id=226979
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+
2021-06-17 Alan Coon <alanc...@apple.com>
Cherry-pick r278870. rdar://problem/79473993
Modified: branches/safari-611.3.10.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (280847 => 280848)
--- branches/safari-611.3.10.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2021-08-10 17:08:11 UTC (rev 280847)
+++ branches/safari-611.3.10.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2021-08-10 17:08:15 UTC (rev 280848)
@@ -518,17 +518,20 @@
webPage->findController().hideFindUI();
webPage->sandboxExtensionTracker().didStartProvisionalLoad(m_frame.ptr());
- WebDocumentLoader& provisionalLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().provisionalDocumentLoader());
- auto& url = ""
+
RefPtr<API::Object> userData;
// Notify the bundle client.
webPage->injectedBundleLoaderClient().didStartProvisionalLoadForFrame(*webPage, m_frame, userData);
+ RefPtr provisionalLoader = static_cast<WebDocumentLoader*>(m_frame->coreFrame()->loader().provisionalDocumentLoader());
- auto& unreachableURL = provisionalLoader.unreachableURL();
-
+ if (!provisionalLoader)
+ return;
+
+ auto& url = ""
+ auto& unreachableURL = provisionalLoader->unreachableURL();
// Notify the UIProcess.
- webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), m_frame->info(), provisionalLoader.request(), provisionalLoader.navigationID(), url, unreachableURL, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
+ webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), m_frame->info(), provisionalLoader->request(), provisionalLoader->navigationID(), url, unreachableURL, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
}
static constexpr unsigned maxTitleLength = 1000; // Closest power of 10 above the W3C recommendation for Title length.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
