Changeset 181424 in webkit

Timestamp:

Mar 11, 2015 7:01:42 PM (9 years ago)

Author:

Antti Koivisto

Message:

Cache traversal missing large entries
​https://bugs.webkit.org/show_bug.cgi?id=142601

Reviewed by Andreas Kling.

When traversing cache entries we only read the header data from disk. This didn't work
correctly for entries larger than the read size.

• NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:

(WebKit::NetworkCache::IOChannel::read):

Partial reads only receive one callback with 'done' set to true.
Ensure we actually return data in this case.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::decodeEntryHeader):

Add some logging.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-11  Antti Koivisto  <antti@apple.com>
+
+        Cache traversal missing large entries
+        https://bugs.webkit.org/show_bug.cgi?id=142601
+
+        Reviewed by Andreas Kling.
+
+        When traversing cache entries we only read the header data from disk. This didn't work
+        correctly for entries larger than the read size.
+
+        * NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
+        (WebKit::NetworkCache::IOChannel::read):
+
+            Partial reads only receive one callback with 'done' set to true.
+            Ensure we actually return data in this case.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::decodeEntryHeader):
+
+            Add some logging.
+
 2015-03-11  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm

@@ -81 +81 @@
     bool didCallCompletionHandler = false;
     dispatch_io_read(m_dispatchIO.get(), offset, size, dispatch_get_main_queue(), [channel, completionHandler, didCallCompletionHandler](bool done, dispatch_data_t fileData, int error) mutable {
-        if (done) {
-            if (!didCallCompletionHandler) {
-                Data nullData;
-                completionHandler(nullData, error);
-            }
+        ASSERT_UNUSED(done, done || !didCallCompletionHandler);
+        if (didCallCompletionHandler)
             return;
-        }
-        ASSERT(!didCallCompletionHandler);
         DispatchPtr<dispatch_data_t> fileDataPtr(fileData);
         Data data(fileDataPtr);

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -180 +180 @@
 static bool decodeEntryHeader(const Data& fileData, EntryMetaData& metaData, Data& data)
 {
-    if (!decodeEntryMetaData(metaData, fileData))
+    if (!decodeEntryMetaData(metaData, fileData)) {
+        LOG(NetworkCacheStorage, "(NetworkProcess) meta data decode failure");
         return false;
-    if (metaData.cacheStorageVersion != Storage::version)
+    }
+
+    if (metaData.cacheStorageVersion != Storage::version) {
+        LOG(NetworkCacheStorage, "(NetworkProcess) version mismatch");
         return false;
-    if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset)
+    }
+    if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset) {
+        LOG(NetworkCacheStorage, "(NetworkProcess) body offset mismatch");
         return false;
+    }
 
     auto headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);