Title: [241505] branches/safari-607-branch/Source/WebKit
- Revision
- 241505
- Author
- [email protected]
- Date
- 2019-02-14 00:34:29 -0800 (Thu, 14 Feb 2019)
Log Message
Cherry-pick r241448. rdar://problem/48065637
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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (241504 => 241505)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-02-14 08:34:27 UTC (rev 241504)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-02-14 08:34:29 UTC (rev 241505)
@@ -1,5 +1,36 @@
2019-02-13 Babak Shafiei <[email protected]>
+ Cherry-pick r241448. rdar://problem/48065637
+
+ 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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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 Babak Shafiei <[email protected]>
+
Cherry-pick r241401. rdar://problem/48065612
Crash in Page::setActivityState because m_page is null
Modified: branches/safari-607-branch/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp (241504 => 241505)
--- branches/safari-607-branch/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2019-02-14 08:34:27 UTC (rev 241504)
+++ branches/safari-607-branch/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2019-02-14 08:34:29 UTC (rev 241505)
@@ -55,7 +55,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
