Attachment 362290 Details for Bug 194774 – Patch

[patch] Patch

bug-194774-20190218144130.patch (text/plain), 1.99 KB, created by Claudio Saavedra on 2019-02-18 04:41:31 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Claudio Saavedra

Created: 2019-02-18 04:41:31 PST

Size: 1.99 KB

patch

obsolete

>Subversion Revision: 241658
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 75c76adadc96ed1e361b0e6b2e4811a44e8208f4..cedcfa2eedd2aa33dfd7e433583e53bd1ead0cf7 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-18  Claudio Saavedra  <csaavedra@igalia.com>
>+
>+        WebPageProxy::didFinishDocumentLoadForFrame() crashing in WPE and GTK+ ports
>+        https://bugs.webkit.org/show_bug.cgi?id=194774
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
>+        navigationState().navigation(navigationID) can return nullptr and
>+        needs to be safe-guarded, as it's the case in other methods fetching
>+        the navigation this way.
>+
> 2019-02-17  Youenn Fablet  <youenn@apple.com>
> 
>         https://device.login.microsoftonline.com is hanging on STP75
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index f0a3d4c8fafaa111337f87e2dd058c81260baade..8a0e7f125ac078c03eac54ccca24e8a2135b621c 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -4134,8 +4134,7 @@ void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navi
> 
>     // FIXME: We should message check that navigationID is not zero here, but it's currently zero for some navigations through the page cache.
>     RefPtr<API::Navigation> navigation;
>-    if (frame->isMainFrame() && navigationID) {
>-        navigation = navigationState().navigation(navigationID);
>+    if (frame->isMainFrame() && navigationID && (navigation = navigationState().navigation(navigationID))) {
>         if (auto& adClickAttribution = navigation->adClickAttribution()) {
>             if (adClickAttribution->destination().matches(frame->url()))
>                 m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::StoreAdClickAttribution(m_websiteDataStore->sessionID(), *adClickAttribution));

Actions: View | Formatted Diff | Diff

Attachments on bug 194774: 362290