Changeset 64430 in webkit

Timestamp:

Jul 31, 2010 5:42:40 PM (14 years ago)

Author:

weinig@apple.com

Message:

Crash due to calling StringImpl::createCFString() from non-main thread in plug-in code
​https://bugs.webkit.org/show_bug.cgi?id=43306
<rdar://problem/8259687>

Reviewed by Darin Adler.

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::PluginInfoStore::getMIMETypeForExtension):
(WebKit::PluginInfoStore::findPlugin):

• UIProcess/Plugins/PluginInfoStore.h:
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm:

(WebKit::safeCreateCFString):
(WebKit::PluginInfoStore::getMIMETypeForExtension):
Bypass MIMETypeRegistry in the UIProcess until we can safely convert Strings
to CFStringRefs.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/PluginInfoStore.cpp (modified) (2 diffs)
• UIProcess/Plugins/PluginInfoStore.h (modified) (1 diff)
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm (modified) (3 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-31  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Crash due to calling StringImpl::createCFString() from non-main thread in plug-in code
+        https://bugs.webkit.org/show_bug.cgi?id=43306
+        <rdar://problem/8259687>
+
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::PluginInfoStore::getMIMETypeForExtension):
+        (WebKit::PluginInfoStore::findPlugin):
+        * UIProcess/Plugins/PluginInfoStore.h:
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        (WebKit::safeCreateCFString):
+        (WebKit::PluginInfoStore::getMIMETypeForExtension):
+        Bypass MIMETypeRegistry in the UIProcess until we can safely convert Strings
+        to CFStringRefs.
+
 2010-07-31  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -152 +152 @@
 }
 
+#if !PLATFORM(MAC)
+String PluginInfoStore::getMIMETypeForExtension(const String& extension)
+{
+    return MIMETypeRegistry::getMIMETypeForExtension(extension);
+}
+#endif
+
 PluginInfoStore::Plugin PluginInfoStore::findPlugin(String& mimeType, const KURL& url)
 {
@@ -171 +178 @@
         
         // Finally, try to get the MIME type from the extension in a platform specific manner and use that.
-        String extensionMimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
+        String extensionMimeType = getMIMETypeForExtension(extension);
         if (!extensionMimeType.isNull()) {
             Plugin plugin = findPluginForMIMEType(extensionMimeType);

trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h

@@ -74 +74 @@
     static bool getPluginInfo(const WebCore::String& pluginPath, Plugin& plugin);
     static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
-    
+    static WebCore::String getMIMETypeForExtension(const WebCore::String& extension);
+
     Vector<WebCore::String> m_additionalPluginsDirectories;
     Vector<Plugin> m_plugins;

trunk/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

@@ -26 +26 @@
 #include "PluginInfoStore.h"
 
+#include "WebKitSystemInterface.h"
 #include <WebCore/WebCoreNSStringExtras.h>
 #include <wtf/HashSet.h>
@@ -46 +47 @@
 // FIXME: Once the UI process knows the difference between the main thread and the web thread we can drop this and just use
 // String::createCFString.
-static CFStringRef safeCreateCFString(const String& directory)
-{
-    return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(directory.characters()), directory.length());
+static CFStringRef safeCreateCFString(const String& string)
+{
+    return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(string.characters()), string.length());
 }
     
@@ -368 +369 @@
 }
 
+String PluginInfoStore::getMIMETypeForExtension(const String& extension)
+{
+    // FIXME: This should just call MIMETypeRegistry::getMIMETypeForExtension and be
+    // strength reduced into the callsite once we can safely convert WebCore::String
+    // to CFStringRef off the main thread.
+
+    RetainPtr<CFStringRef> extensionCFString(AdoptCF, safeCreateCFString(extension));
+    return WKGetMIMETypeForExtension((NSString *)extensionCFString.get());
+}
+
 } // namespace WebKit