Merge r241544 - Do not add a caches to its engine if the salt cannot …

…be initialized https://bugs.webkit.org/show_bug.cgi?id=194604 Reviewed by Antti Koivisto. This is a follow-up to https://bugs.webkit.org/show_bug.cgi?id=194588. We should return early if initialize fails. * NetworkProcess/cache/CacheStorageEngine.cpp: (WebKit::CacheStorage::Engine::readCachesFromDisk):
WebKit · Feb 18, 2019 · 63c9129 · 63c9129
1 parent 0bab4ce
commit 63c9129
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2019-02-14  Youenn Fablet  <youenn@apple.com>
+
+        Do not add a caches to its engine if the salt cannot be initialized
+        https://bugs.webkit.org/show_bug.cgi?id=194604
+
+        Reviewed by Antti Koivisto.
+
+        This is a follow-up to https://bugs.webkit.org/show_bug.cgi?id=194588.
+        We should return early if initialize fails.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::readCachesFromDisk):
+
 2019-02-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.23.90 release

diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
@@ -310,6 +310,11 @@ void Engine::initialize(CompletionCallback&& callback)
 void Engine::readCachesFromDisk(const WebCore::ClientOrigin& origin, CachesCallback&& callback)
 {
     initialize([this, origin, callback = WTFMove(callback)](Optional<Error>&& error) mutable {
+        if (error) {
+            callback(makeUnexpected(error.value()));
+            return;
+        }
+
         auto& caches = m_caches.ensure(origin, [&origin, this] {
             auto path = cachesRootPath(origin);
             return Caches::create(*this, WebCore::ClientOrigin { origin }, WTFMove(path), m_quota);
@@ -320,11 +325,6 @@ void Engine::readCachesFromDisk(const WebCore::ClientOrigin& origin, CachesCallb
             return;
         }
 
-        if (error) {
-            callback(makeUnexpected(error.value()));
-            return;
-        }
-
         caches->initialize([callback = WTFMove(callback), caches = caches.copyRef()](Optional<Error>&& error) mutable {
             if (error) {
                 callback(makeUnexpected(error.value()));