Changeset 244850 in webkit

Timestamp:

May 1, 2019, 2:19:24 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Protect against null crash in fetchDiskCacheEntries
​https://bugs.webkit.org/show_bug.cgi?id=197399
<rdar://problem/47759337>

Reviewed by Antti Koivisto.

If the call to Entry::decodeStorageRecord returns nullptr in Storage::traverse, do not call the traverseHandler, which expects
that when it is called with nullptr that is the end of the traversal.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::traverse):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-01  Alex Christensen  <achristensen@webkit.org>
+
+        Protect against null crash in fetchDiskCacheEntries
+        https://bugs.webkit.org/show_bug.cgi?id=197399
+        <rdar://problem/47759337>
+
+        Reviewed by Antti Koivisto.
+
+        If the call to Entry::decodeStorageRecord returns nullptr in Storage::traverse, do not call the traverseHandler, which expects
+        that when it is called with nullptr that is the end of the traversal.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::traverse):
+
 2019-05-01  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -479 +479 @@
 
         auto entry = Entry::decodeStorageRecord(*record);
-        if (!entry) {
-            traverseHandler(nullptr);
+        if (!entry)
             return;
-        }
 
         TraversalEntry traversalEntry { *entry, recordInfo };