Title: [186431] releases/WebKitGTK/webkit-2.8/Source/WebCore
Revision
186431
Author
[email protected]
Date
2015-07-07 03:13:32 -0700 (Tue, 07 Jul 2015)

Log Message

Merge r185927 - Null dereference in DocumentLoader::areAllLoadersPageCacheAcceptable()
https://bugs.webkit.org/show_bug.cgi?id=146286
<rdar://problem/21523788>

Reviewed by Sam Weinig.

Add null check for the Page in areAllLoadersPageCacheAcceptable()
to fix this top crasher until I can investigate how this can happen.

* loader/DocumentLoader.cpp:
(WebCore::areAllLoadersPageCacheAcceptable):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186430 => 186431)


--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-07-07 10:11:27 UTC (rev 186430)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-07-07 10:13:32 UTC (rev 186431)
@@ -1,3 +1,17 @@
+2015-06-24  Chris Dumez  <[email protected]>
+
+        Null dereference in DocumentLoader::areAllLoadersPageCacheAcceptable()
+        https://bugs.webkit.org/show_bug.cgi?id=146286
+        <rdar://problem/21523788>
+
+        Reviewed by Sam Weinig.
+
+        Add null check for the Page in areAllLoadersPageCacheAcceptable()
+        to fix this top crasher until I can investigate how this can happen.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::areAllLoadersPageCacheAcceptable):
+
 2015-06-30  Zalan Bujtas  <[email protected]>
 
         Addressing post-review comments in r185916

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/DocumentLoader.cpp (186430 => 186431)


--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/DocumentLoader.cpp	2015-07-07 10:11:27 UTC (rev 186430)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/DocumentLoader.cpp	2015-07-07 10:13:32 UTC (rev 186431)
@@ -103,7 +103,7 @@
         if (!handle)
             return false;
 
-        if (!loader->frameLoader())
+        if (!loader->frameLoader() || !loader->frameLoader()->frame().page())
             return false;
 
         CachedResource* cachedResource = MemoryCache::singleton().resourceForURL(handle->firstRequest().url(), loader->frameLoader()->frame().page()->sessionID());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to