diff options
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm')
-rw-r--r-- | Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm index d290f5b..6a867a0 100644 --- a/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm +++ b/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm @@ -273,22 +273,19 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu if (mimeTypesAndExtensions.size() % 2) 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; if (!getStringListResource(MIMEDescriptionStringNumber, mimeTypeDescriptions)) return false; - if (mimeTypeDescriptions.size() != numMimeTypes) - return false; - // Add all MIME types. for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) { MimeClassInfo mimeClassInfo; const String& mimeType = mimeTypesAndExtensions[i * 2]; - const String& description = mimeTypeDescriptions[i]; + String description; + if (i < mimeTypeDescriptions.size()) + description = mimeTypeDescriptions[i]; mimeClassInfo.type = mimeType.lower(); mimeClassInfo.desc = description; |