Title: [230248] branches/safari-605-branch/Source/WebKitLegacy/mac
Revision
230248
Author
[email protected]
Date
2018-04-03 23:11:15 -0700 (Tue, 03 Apr 2018)

Log Message

Cherry-pick r229414. rdar://problem/38651634

    Possible null dereference of the page under WebFrameNetworkingContext::storageSession()
    https://bugs.webkit.org/show_bug.cgi?id=183455
    <rdar://problem/38191749>

    Reviewed by Youenn Fablet.

    Add a null check for the page as we have evidence from crashes that it can be null.
    Other functions in WebFrameNetworkingContext already null check the page as well,
    not just the frame so this is consistent.

    * WebCoreSupport/WebFrameNetworkingContext.mm:
    (WebFrameNetworkingContext::storageSession const):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229414 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog (230247 => 230248)


--- branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog	2018-04-04 06:11:13 UTC (rev 230247)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog	2018-04-04 06:11:15 UTC (rev 230248)
@@ -1,3 +1,38 @@
+2018-04-03  Jason Marcell  <[email protected]>
+
+        Cherry-pick r229414. rdar://problem/38651634
+
+    Possible null dereference of the page under WebFrameNetworkingContext::storageSession()
+    https://bugs.webkit.org/show_bug.cgi?id=183455
+    <rdar://problem/38191749>
+    
+    Reviewed by Youenn Fablet.
+    
+    Add a null check for the page as we have evidence from crashes that it can be null.
+    Other functions in WebFrameNetworkingContext already null check the page as well,
+    not just the frame so this is consistent.
+    
+    * WebCoreSupport/WebFrameNetworkingContext.mm:
+    (WebFrameNetworkingContext::storageSession const):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229414 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-08  Chris Dumez  <[email protected]>
+
+            Possible null dereference of the page under WebFrameNetworkingContext::storageSession()
+            https://bugs.webkit.org/show_bug.cgi?id=183455
+            <rdar://problem/38191749>
+
+            Reviewed by Youenn Fablet.
+
+            Add a null check for the page as we have evidence from crashes that it can be null.
+            Other functions in WebFrameNetworkingContext already null check the page as well,
+            not just the frame so this is consistent.
+
+            * WebCoreSupport/WebFrameNetworkingContext.mm:
+            (WebFrameNetworkingContext::storageSession const):
+
 2018-03-21  Jason Marcell  <[email protected]>
 
         Cherry-pick r229297. rdar://problem/38682578

Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm (230247 => 230248)


--- branches/safari-605-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm	2018-04-04 06:11:13 UTC (rev 230247)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm	2018-04-04 06:11:15 UTC (rev 230248)
@@ -93,7 +93,7 @@
 NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
 {
     ASSERT(isMainThread());
-    if (frame() && frame()->page()->sessionID().isEphemeral()) {
+    if (frame() && frame()->page() && frame()->page()->sessionID().isEphemeral()) {
         if (auto* session = NetworkStorageSession::storageSession(PAL::SessionID::legacyPrivateSessionID()))
             return *session;
         // Some requests may still be coming shortly before WebCore updates the session ID and after WebKit destroys the private browsing session.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to