Attachment 334185 Details for Bug 182927 – Patch

[patch] Patch

bug-182927-20180219140433.patch (text/plain), 2.10 KB, created by Chris Dumez on 2018-02-19 14:04:34 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-02-19 14:04:34 PST

Size: 2.10 KB

patch

obsolete

>Subversion Revision: 228709
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ff7419d8203f8cf3c6cef14a87076e660f9d85bf..e0ea1e3dbddc9cc2a44667f9b987b26f2d295675 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Jer Noble  <jer.noble@apple.com>
> 
>         [EME] Add mechanism for MediaKeySession to react to HDCP changes
>diff --git a/Source/WebCore/platform/MIMETypeRegistry.cpp b/Source/WebCore/platform/MIMETypeRegistry.cpp
>index be5bfcd9f0a9b655dd18c3aee4113c7c72453bf7..3aa5307438bd0e7089ea46e1fcbf5cd02e4a4b8a 100644
>--- a/Source/WebCore/platform/MIMETypeRegistry.cpp
>+++ b/Source/WebCore/platform/MIMETypeRegistry.cpp
>@@ -492,6 +492,15 @@ bool MIMETypeRegistry::isSupportedJavaScriptMIMEType(const String& mimeType)
> {
>     if (mimeType.isEmpty())
>         return false;
>+
>+    if (!isMainThread()) {
>+        bool isSupported = false;
>+        callOnMainThreadAndWait([&isSupported, mimeType = mimeType.isolatedCopy()] {
>+            isSupported = isSupportedJavaScriptMIMEType(mimeType);
>+        });
>+        return isSupported;
>+    }
>+
>     if (!supportedJavaScriptMIMETypes)
>         initializeSupportedNonImageMimeTypes();
>     return supportedJavaScriptMIMETypes->contains(mimeType);

Actions: View | Formatted Diff | Diff

Attachments on bug 182927: 334185