Changeset 248963 in webkit

Timestamp:

Aug 21, 2019 2:30:03 PM (5 years ago)

Author:

Chris Dumez

Message:

Have NetworkCache::store() null check its completion handler before calling it
​https://bugs.webkit.org/show_bug.cgi?id=200994

Reviewed by Geoffrey Garen.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::retrieveCacheEntry):
Stop passing nullptr for the completion handler now that the parameter has a default value.
Note that passing nullptr here was likely wrong since the NetworkCache::store() implementation
did not null-check the completion handler before calling it.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::store):
Have NetworkCache::store() null check its completion handler before calling it as calling
a null WTF::Function crashes.

• NetworkProcess/cache/NetworkCache.h:

Use nullptr as default parameter value for the completion handler.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-21  Chris Dumez  <cdumez@apple.com>
+
+        Have NetworkCache::store() null check its completion handler before calling it
+        https://bugs.webkit.org/show_bug.cgi?id=200994
+
+        Reviewed by Geoffrey Garen.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::retrieveCacheEntry):
+        Stop passing nullptr for the completion handler now that the parameter has a default value.
+        Note that passing nullptr here was likely wrong since the NetworkCache::store() implementation
+        did not null-check the completion handler before calling it.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::store):
+        Have NetworkCache::store() null check its completion handler before calling it as calling
+        a null WTF::Function crashes.
+
+        * NetworkProcess/cache/NetworkCache.h:
+        Use nullptr as default parameter value for the completion handler.
+
 2019-08-21  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -232 +232 @@
                 auto cacheEntry = m_cache->makeEntry(request, entry->response, buffer.copyRef());
                 retrieveCacheEntryInternal(WTFMove(cacheEntry), ResourceRequest { request });
-                m_cache->store(request, entry->response, WTFMove(buffer), nullptr);
+                m_cache->store(request, entry->response, WTFMove(buffer));
                 return;
             }

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

@@ -416 +416 @@
         }
 #endif
-        completionHandler(mappedBody);
+        if (completionHandler)
+            completionHandler(mappedBody);
         LOG(NetworkCache, "(NetworkProcess) stored");
     });

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

@@ -116 +116 @@
     using RetrieveCompletionHandler = Function<void(std::unique_ptr<Entry>, const RetrieveInfo&)>;
     void retrieve(const WebCore::ResourceRequest&, const GlobalFrameID&, RetrieveCompletionHandler&&);
-    std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, Function<void(MappedBody&)>&&);
+    std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, Function<void(MappedBody&)>&& = nullptr);
     std::unique_ptr<Entry> storeRedirect(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, const WebCore::ResourceRequest& redirectRequest, Optional<Seconds> maxAgeCap);
     std::unique_ptr<Entry> update(const WebCore::ResourceRequest&, const GlobalFrameID&, const Entry&, const WebCore::ResourceResponse& validatingResponse);