Changeset 245356 in webkit

Timestamp:

May 15, 2019, 2:45:04 PM (7 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/50753918

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-14  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/50753918
+
+    2019-05-14  Chris Dumez  <cdumez@apple.com>
+
+            MobileSafari crash at WebKit: WebKit::WebPageProxy::didCommitLoadForFrame
+            <rdar://problem/49908163>
+
+            Reviewed by Alex Christensen.
+
+            Partial cherry-pick of r243767 to fix the crash on the branch. The rest of
+            r243767 introduced a regression which got fixed later in r244493 so I think
+            this partial cherry-pick is the safest way to resolve the crash while
+            avoiding any potential regressions.
+
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::didCommitLoadForFrame):
+
 2019-05-14  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -4048 +4048 @@
     // 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 ENABLE(RESOURCE_LOAD_STATISTICS)
         auto requesterOrigin = navigation->lastNavigationAction().requesterOrigin;