Title: [241522] releases/WebKitGTK/webkit-2.24/Source/WebKit
Revision
241522
Author
[email protected]
Date
2019-02-14 03:27:02 -0800 (Thu, 14 Feb 2019)

Log Message

Merge r241448 - Crash in WebKit::CacheStorage::Engine::cachesRootPath
https://bugs.webkit.org/show_bug.cgi?id=194588
<rdar://problem/46363997>

Reviewed by Youenn Fablet.

* NetworkProcess/cache/CacheStorageEngine.cpp:
(WebKit::CacheStorage::Engine::cachesRootPath):

Salt may have not been initialized yet when the Engine is destroyed.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (241521 => 241522)


--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog	2019-02-14 11:26:58 UTC (rev 241521)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog	2019-02-14 11:27:02 UTC (rev 241522)
@@ -1,3 +1,16 @@
+2019-02-13  Antti Koivisto  <[email protected]>
+
+        Crash in WebKit::CacheStorage::Engine::cachesRootPath
+        https://bugs.webkit.org/show_bug.cgi?id=194588
+        <rdar://problem/46363997>
+
+        Reviewed by Youenn Fablet.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::cachesRootPath):
+
+        Salt may have not been initialized yet when the Engine is destroyed.
+
 2019-02-13  Alex Christensen  <[email protected]>
 
         Remove legacy sync messaging in some IPC code

Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp (241521 => 241522)


--- releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp	2019-02-14 11:26:58 UTC (rev 241521)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp	2019-02-14 11:27:02 UTC (rev 241522)
@@ -48,7 +48,7 @@
 
 String Engine::cachesRootPath(const WebCore::ClientOrigin& origin)
 {
-    if (!shouldPersist())
+    if (!shouldPersist() || !m_salt)
         return { };
 
     Key key(origin.topOrigin.toString(), origin.clientOrigin.toString(), { }, { }, salt());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to