Changeset 228716 in webkit

Timestamp:

Feb 19, 2018 4:20:53 PM (6 years ago)

Author:

Chris Dumez

Message:

Crash under MIMETypeRegistry::isSupportedJavaScriptMIMEType()
​https://bugs.webkit.org/show_bug.cgi?id=182927
<rdar://problem/37675748>

Reviewed by Antti Koivisto.

Make it safe to call MIMETypeRegistry::isSupportedJavaScriptMIMEType() from the non-main thread.
It is currently being called from a background thread in the following places:

• ServiceWorkerJob::didReceiveResponse()
• WorkerGlobalScope::importScripts()

These call sites on non-main threads were added recently with the support for service workers.

No new tests, already covered by existing tests that flakily experience service worker
process crashes.

• platform/MIMETypeRegistry.cpp:

(WebCore::MIMETypeRegistry::isSupportedJavaScriptMIMEType):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MIMETypeRegistry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-19  Chris Dumez  <cdumez@apple.com>
+
+        Crash under MIMETypeRegistry::isSupportedJavaScriptMIMEType()
+        https://bugs.webkit.org/show_bug.cgi?id=182927
+        <rdar://problem/37675748>
+
+        Reviewed by Antti Koivisto.
+
+        Make it safe to call MIMETypeRegistry::isSupportedJavaScriptMIMEType() from the non-main thread.
+        It is currently being called from a background thread in the following places:
+        - ServiceWorkerJob::didReceiveResponse()
+        - WorkerGlobalScope::importScripts()
+
+        These call sites on non-main threads were added recently with the support for service workers.
+
+        No new tests, already covered by existing tests that flakily experience service worker
+        process crashes.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::MIMETypeRegistry::isSupportedJavaScriptMIMEType):
+
 2018-02-19  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

@@ -493 +493 @@
     if (mimeType.isEmpty())
         return false;
+
+    if (!isMainThread()) {
+        bool isSupported = false;
+        callOnMainThreadAndWait([&isSupported, mimeType = mimeType.isolatedCopy()] {
+            isSupported = isSupportedJavaScriptMIMEType(mimeType);
+        });
+        return isSupported;
+    }
+
     if (!supportedJavaScriptMIMETypes)
         initializeSupportedNonImageMimeTypes();