Changeset 83625 in webkit

Timestamp:

Apr 12, 2011 12:56:04 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-12 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Cisco Meeting Center will not download or launch from Safari
​https://bugs.webkit.org/show_bug.cgi?id=58366
<rdar://problem/8987139>

It's OK if a plug-in has less (or more) MIME type descriptions than actual MIME types.

• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm: (WebKit::getPluginInfoFromCarbonResources):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-12  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Cisco Meeting Center will not download or launch from Safari
+        https://bugs.webkit.org/show_bug.cgi?id=58366
+        <rdar://problem/8987139>
+
+        It's OK if a plug-in has less (or more) MIME type descriptions than actual MIME types.
+        
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::getPluginInfoFromCarbonResources):
+
 2011-04-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -274 +274 @@
         return false;
 
-    size_t numMimeTypes = mimeTypesAndExtensions.size() / 2;
-    
     // Now get the MIME type descriptions string list. This string list needs to be the same length as the number of MIME types.
     Vector<String> mimeTypeDescriptions;
@@ -281 +279 @@
         return false;
 
-    if (mimeTypeDescriptions.size() != numMimeTypes)
-        return false;
-
     // Add all MIME types.
     for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) {
@@ -289 +284 @@
         
         const String& mimeType = mimeTypesAndExtensions[i * 2];
-        const String& description = mimeTypeDescriptions[i];
+        String description;
+        if (i < mimeTypeDescriptions.size())
+            description = mimeTypeDescriptions[i];
         
         mimeClassInfo.type = mimeType.lower();