Changeset 38184 in webkit

Timestamp:

Nov 6, 2008 10:41:18 AM (15 years ago)

Author:

alp@webkit.org

Message:

2008-11-06 Alp Toker <​alp@nuanti.com>

Reviewed by Cameron Zwarich.

​https://bugs.webkit.org/show_bug.cgi?id=22067
[GTK] Sun Java plugin segfaults at PluginPackage::createPackage()

null-check symbols loaded from plugin modules, initialize the function
table (like Win already does) and update it with the latest
additions. Adjust whitespace for easy diff'ing with the Win port code
from which it was forked.

This fixes crashes with libnspr4.so and any other plugins that don't
provide the symbols we expect.

• plugins/gtk/PluginPackageGtk.cpp: (WebCore::PluginPackage::fetchInfo): (WebCore::PluginPackage::load):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/gtk/PluginPackageGtk.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-06  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Cameron Zwarich.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22067
+        [GTK] Sun Java plugin segfaults at PluginPackage::createPackage()
+
+        null-check symbols loaded from plugin modules, initialize the function
+        table (like Win already does) and update it with the latest
+        additions. Adjust whitespace for easy diff'ing with the Win port code
+        from which it was forked.
+
+        This fixes crashes with libnspr4.so and any other plugins that don't
+        provide the symbols we expect.
+
+        * plugins/gtk/PluginPackageGtk.cpp:
+        (WebCore::PluginPackage::fetchInfo):
+        (WebCore::PluginPackage::load):
+
 2008-11-06  Kristian Amlie  <kristian.amlie@nokia.com>
 

trunk/WebCore/plugins/gtk/PluginPackageGtk.cpp

@@ -87 +87 @@
         return false;
 
-    NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription;
-    NPP_GetValueProcPtr NPP_GetValue;
+    NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = 0;
+    NPP_GetValueProcPtr NPP_GetValue = 0;
 
     g_module_symbol(m_module, "NP_GetMIMEDescription", (void**)&NP_GetMIMEDescription);
     g_module_symbol(m_module, "NP_GetValue", (void**)&NPP_GetValue);
+
+    if (!NP_GetMIMEDescription || !NPP_GetValue)
+        return false;
 
     char* buffer = 0;
@@ -153 +156 @@
     m_isLoaded = true;
 
-    NP_InitializeFuncPtr NP_Initialize;
+    NP_InitializeFuncPtr NP_Initialize = 0;
+    m_NPP_Shutdown = 0;
+
     NPError npErr;
 
@@ -165 +170 @@
     m_pluginFuncs.size = sizeof(m_pluginFuncs);
 
+    memset(&m_browserFuncs, 0, sizeof(m_browserFuncs));
     m_browserFuncs.size = sizeof (m_browserFuncs);
     m_browserFuncs.version = NP_VERSION_MINOR;
+
     m_browserFuncs.geturl = NPN_GetURL;
     m_browserFuncs.posturl = NPN_PostURL;
@@ -190 +197 @@
     m_browserFuncs.pushpopupsenabledstate = NPN_PushPopupsEnabledState;
     m_browserFuncs.poppopupsenabledstate = NPN_PopPopupsEnabledState;
+    m_browserFuncs.pluginthreadasynccall = NPN_PluginThreadAsyncCall;
 
     m_browserFuncs.releasevariantvalue = _NPN_ReleaseVariantValue;
@@ -197 +205 @@
     m_browserFuncs.identifierisstring = _NPN_IdentifierIsString;
     m_browserFuncs.utf8fromidentifier = _NPN_UTF8FromIdentifier;
+    m_browserFuncs.intfromidentifier = _NPN_IntFromIdentifier;
     m_browserFuncs.createobject = _NPN_CreateObject;
     m_browserFuncs.retainobject = _NPN_RetainObject;