Title: [229749] branches/safari-605-branch/Source/WebKitLegacy/mac
- Revision
- 229749
- Author
- jmarc...@apple.com
- Date
- 2018-03-20 08:21:08 -0700 (Tue, 20 Mar 2018)
Log Message
Cherry-pick r229414. rdar://problem/38651634
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog (229748 => 229749)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog 2018-03-20 15:21:06 UTC (rev 229748)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog 2018-03-20 15:21:08 UTC (rev 229749)
@@ -1,3 +1,22 @@
+2018-03-20 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r229414. rdar://problem/38651634
+
+ 2018-03-08 Chris Dumez <cdu...@apple.com>
+
+ 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-02-19 Jason Marcell <jmarc...@apple.com>
Cherry-pick r228580. rdar://problem/37675341
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm (229748 => 229749)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2018-03-20 15:21:06 UTC (rev 229748)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2018-03-20 15:21:08 UTC (rev 229749)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
