Changeset 88735 in webkit

Timestamp:

Jun 13, 2011 5:10:23 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-13 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Crash when trying to use Netflix Watch Instantly with Silverlight 3
​https://bugs.webkit.org/show_bug.cgi?id=62611
<rdar://problem/9058370>

• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm: (WebKit::NetscapePluginModule::getPluginInfo): Get the plug-in version string instead of the version number.

(WebKit::PluginVersion::isValid):
(WebKit::PluginVersion::PluginVersion):
(WebKit::PluginVersion::parse):
(WebKit::PluginVersion::isLessThan):
Add a new PluginVersion class that represents a plug-in version. The idea is
that this class be made cross platform.

(WebKit::NetscapePluginModule::determineQuirks):
Add the ReturnsNonRetainedScriptableNPObject quirk for versions of Silverlight less than 4.

• Shared/Plugins/PluginQuirks.h: Add the ReturnsNonRetainedScriptableNPObject quirk.

• UIProcess/Plugins/PluginInfoStore.h: Use a version string. Eventually this should hold the PluginVersion class we added.

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp: (WebKit::NetscapePlugin::pluginScriptableNPObject): If the plug-in has the ReturnsNonRetainedScriptableNPObject quirk, do an extra retain.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (3 diffs)
• Shared/Plugins/PluginQuirks.h (modified) (1 diff)
• UIProcess/Plugins/PluginInfoStore.h (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Crash when trying to use Netflix Watch Instantly with Silverlight 3
+        https://bugs.webkit.org/show_bug.cgi?id=62611
+        <rdar://problem/9058370>
+
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::NetscapePluginModule::getPluginInfo):
+        Get the plug-in version string instead of the version number.
+
+        (WebKit::PluginVersion::isValid):
+        (WebKit::PluginVersion::PluginVersion):
+        (WebKit::PluginVersion::parse):
+        (WebKit::PluginVersion::isLessThan):
+        Add a new PluginVersion class that represents a plug-in version. The idea is
+        that this class be made cross platform.
+
+        (WebKit::NetscapePluginModule::determineQuirks):
+        Add the ReturnsNonRetainedScriptableNPObject quirk for versions of Silverlight less than 4.
+
+        * Shared/Plugins/PluginQuirks.h:
+        Add the ReturnsNonRetainedScriptableNPObject quirk.
+
+        * UIProcess/Plugins/PluginInfoStore.h:
+        Use a version string. Eventually this should hold the PluginVersion class we added.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::pluginScriptableNPObject):
+        If the plug-in has the ReturnsNonRetainedScriptableNPObject quirk, do an extra retain.
+
 2011-06-13  Ryuan Choi  <ryuan.choi@samsung.com>
 

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

@@ -365 +365 @@
     plugin.path = pluginPath;
     plugin.bundleIdentifier = CFBundleGetIdentifier(bundle.get());
-    plugin.versionNumber = CFBundleGetVersionNumber(bundle.get());
+    if (CFTypeRef versionTypeRef = CFBundleGetValueForInfoDictionaryKey(bundle.get(), kCFBundleVersionKey)) {
+        if (CFGetTypeID(versionTypeRef) == CFStringGetTypeID())
+            plugin.versionString = static_cast<CFStringRef>(versionTypeRef);
+    }
     
     // Check that there's valid info for this plug-in.
@@ -399 +402 @@
     if (!createPluginMIMETypesPreferences)
         return false;
-    
+
     createPluginMIMETypesPreferences();
     return true;
+}
+
+// FIXME: This doesn't need to be platform-specific.
+class PluginVersion {
+public:
+    static PluginVersion parse(const String& versionString);
+
+    bool isLessThan(unsigned componentA) const;
+    bool isValid() const { return !m_versionComponents.isEmpty(); }
+
+private:
+    PluginVersion()
+    {
+    }
+
+    Vector<unsigned, 4> m_versionComponents;
+};
+
+PluginVersion PluginVersion::parse(const String& versionString)
+{
+    PluginVersion version;
+
+    Vector<String> versionStringComponents;
+    versionString.split(".", versionStringComponents);
+    for (size_t i = 0; i < versionStringComponents.size(); ++i) {
+        bool successfullyParsed = false;
+        unsigned versionComponent = versionStringComponents[i].toUInt(&successfullyParsed);
+        if (!successfullyParsed)
+            return PluginVersion();
+
+        version.m_versionComponents.append(versionComponent);
+    }
+
+    return version;
+}
+
+bool PluginVersion::isLessThan(unsigned componentA) const
+{
+    ASSERT(isValid());
+
+    return m_versionComponents[0] < componentA;
 }
 
@@ -428 +472 @@
         // there's a 'background' attribute.
         m_pluginQuirks.add(PluginQuirks::MakeTransparentIfBackgroundAttributeExists);
+
+        PluginVersion pluginVersion = PluginVersion::parse(plugin.versionString);
+        if (pluginVersion.isValid()) {
+            if (pluginVersion.isLessThan(4)) {
+                // Versions of Silverlight prior to 4 don't retain the scriptable NPObject.
+                m_pluginQuirks.add(PluginQuirks::ReturnsNonRetainedScriptableNPObject);
+            }
+        }
     }
 

trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h

@@ -60 +60 @@
         ReturnsRetainedCoreAnimationLayer,
 
+        // Whether NPP_GetValue with NPPVpluginScriptableNPObject returns a non-retained NPObject or not.
+        // Versions of Silverlight prior to 4 never retained the returned NPObject.
+        ReturnsNonRetainedScriptableNPObject,
+
 #ifndef NP_NO_QUICKDRAW
         // Allow the plug-in to use the QuickDraw drawing model, since we know that the plug-in

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h

@@ -48 +48 @@
         cpu_type_t pluginArchitecture;
         String bundleIdentifier;
-        unsigned versionNumber;
+        String versionString;
 #elif PLATFORM(WIN)
         uint64_t fileVersion;

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -28 +28 @@
 
 #include "NPRuntimeObjectMap.h"
+#include "NPRuntimeUtilities.h"
 #include "NetscapePluginStream.h"
 #include "PluginController.h"
@@ -738 +739 @@
     if (NPP_GetValue(NPPVpluginScriptableNPObject, &scriptableNPObject) != NPERR_NO_ERROR)
         return 0;
-    
+
+#if PLUGIN_ARCHITECTURE(MAC)
+    if (m_pluginModule->pluginQuirks().contains(PluginQuirks::ReturnsNonRetainedScriptableNPObject))
+        retainNPObject(scriptableNPObject);        
+#endif    
+
     return scriptableNPObject;
 }