Changeset 254501 in webkit

Timestamp:

Jan 14, 2020 1:17:46 AM (4 years ago)

Author:

youenn@apple.com

Message:

CacheStorage::Engine::clearCachesForOriginFromDisk ASSERT is buggy
​https://bugs.webkit.org/show_bug.cgi?id=206057
<rdar://problem/57762994>

Reviewed by John Wilander.

The ASSERT is only valid if the engine is initialized.
It is not needed to initialize it if the plan is to remove all disk files.
Instead, update ASSERT to check that either m_salt is not there or the salt is there and the path is as expected.

• NetworkProcess/cache/CacheStorageEngine.cpp:

(WebKit::CacheStorage::Engine::clearCachesForOriginFromDirectories):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngine.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-14  youenn fablet  <youenn@apple.com>
+
+        CacheStorage::Engine::clearCachesForOriginFromDisk ASSERT is buggy
+        https://bugs.webkit.org/show_bug.cgi?id=206057
+        <rdar://problem/57762994>
+
+        Reviewed by John Wilander.
+
+        The ASSERT is only valid if the engine is initialized.
+        It is not needed to initialize it if the plan is to remove all disk files.
+        Instead, update ASSERT to check that either m_salt is not there or the salt is there and the path is as expected.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::clearCachesForOriginFromDirectories):
+
 2020-01-14  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp

@@ -745 +745 @@
                 return;
 
-            ASSERT(folderPath == cachesRootPath(*folderOrigin));
+            // If cache salt is initialized and the paths do not match, some cache files have probably be removed or partially corrupted.
+            ASSERT(!m_salt || folderPath == cachesRootPath(*folderOrigin));
             deleteDirectoryRecursivelyOnBackgroundThread(folderPath, [callbackAggregator = WTFMove(callbackAggregator)] { });
         });