Changeset 249105 in webkit

Timestamp:

Aug 26, 2019, 10:51:18 AM (7 years ago)

Author:

youenn@apple.com

Message:

CacheStorageConnection::computeRealBodySize is not thread-safe
​https://bugs.webkit.org/show_bug.cgi?id=201074

Reviewed by Chris Dumez.

In case of a form data, the size computation might require sync IPC to the network process which is not thread-safe
In that case, hop to the main thread to compute the size of the body.
Covered by existing service worker tests in Debug mode.

• Modules/cache/CacheStorageConnection.cpp:

(WebCore::formDataSize):
(WebCore::CacheStorageConnection::computeRealBodySize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/cache/CacheStorageConnection.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-26  Youenn Fablet  <youenn@apple.com>
+
+        CacheStorageConnection::computeRealBodySize is not thread-safe
+        https://bugs.webkit.org/show_bug.cgi?id=201074
+
+        Reviewed by Chris Dumez.
+
+        In case of a form data, the size computation might require sync IPC to the network process which is not thread-safe
+        In that case, hop to the main thread to compute the size of the body.
+        Covered by existing service worker tests in Debug mode.
+
+        * Modules/cache/CacheStorageConnection.cpp:
+        (WebCore::formDataSize):
+        (WebCore::CacheStorageConnection::computeRealBodySize):
+
 2019-08-26  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/cache/CacheStorageConnection.cpp

@@ -34 +34 @@
 using namespace WebCore::DOMCacheEngine;
 
+static inline uint64_t formDataSize(const FormData& formData, PAL::SessionID sessionID)
+{
+    if (isMainThread())
+        return formData.lengthInBytes(sessionID);
+
+    uint64_t resultSize;
+    callOnMainThreadAndWait([sessionID, formData = formData.isolatedCopy(), &resultSize] {
+        resultSize = formData->lengthInBytes(sessionID);
+    });
+    return resultSize;
+}
+
 uint64_t CacheStorageConnection::computeRealBodySize(const DOMCacheEngine::ResponseBody& body)
 {
     uint64_t result = 0;
-    WTF::switchOn(body, [&] (const Ref<WebCore::FormData>& formData) {
-        result = formData->lengthInBytes(sessionID());
-    }, [&] (const Ref<WebCore::SharedBuffer>& buffer) {
+    WTF::switchOn(body, [&] (const Ref<FormData>& formData) {
+        result = formDataSize(formData, sessionID());
+    }, [&] (const Ref<SharedBuffer>& buffer) {
         result = buffer->size();
     }, [] (const std::nullptr_t&) {