Changeset 65703 in webkit

Timestamp:

Aug 19, 2010 2:22:13 PM (14 years ago)

Author:

Adam Roben

Message:

Call NP_GetEntryPoints before NP_Initialize on Windows

Doing otherwise will cause Flash and QuickTime to crash inside
NP_Initialize.

Fixes <​http://webkit.org/b/44270> <rdar://problem/8330393> Crash in
NP_Initialize when loading QuickTime when running
plugins/embed-attributes-setting.html in WebKit2 on Windows

Reviewed by Sam Weinig.

WebKit2:

• WebProcess/Plugins/Netscape/NetscapePluginModule.cpp:

(WebKit::NetscapePluginModule::tryLoad): On Windows, first call
NP_GetEntryPoints, then NP_Initialize. Do the reverse on Mac to
prevent Silverlight (e.g.) from crashing (see r38858).

WebKitTools:

Test that NP_Initialize and NP_GetEntryPoints are called in the
correct order

The order differs between Mac and Windows (see r38858).

• DumpRenderTree/TestNetscapePlugIn/main.cpp: Added a CRASH macro and

a boolean to record whether NP_GetEntryPoints has been called.
(NP_Initialize): Crash on Windows if NP_GetEntryPoints hasn't been
called yet. This matches Flash and QuickTime's behavior. Crash on Mac
if NP_GetEntryPoints has been called already. This matches
Silverlight's behavior.

Location:

trunk

Files:

• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp (modified) (3 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-08-19  Adam Roben  <aroben@apple.com>
+
+        Call NP_GetEntryPoints before NP_Initialize on Windows
+
+        Doing otherwise will cause Flash and QuickTime to crash inside
+        NP_Initialize.
+
+        Fixes <http://webkit.org/b/44270> <rdar://problem/8330393> Crash in
+        NP_Initialize when loading QuickTime when running
+        plugins/embed-attributes-setting.html in WebKit2 on Windows
+
+        Reviewed by Sam Weinig.
+
+        * WebProcess/Plugins/Netscape/NetscapePluginModule.cpp:
+        (WebKit::NetscapePluginModule::tryLoad): On Windows, first call
+        NP_GetEntryPoints, then NP_Initialize. Do the reverse on Mac to
+        prevent Silverlight (e.g.) from crashing (see r38858).
+
 2010-08-19  Adam Roben  <aroben@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp

@@ -130 +130 @@
         return false;
 
-    if (initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)
-        return false;
-
     m_pluginFuncs.size = sizeof(NPPluginFuncs);
     m_pluginFuncs.version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-    if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR)
+
+    // On Mac, NP_Initialize must be called first, then NP_GetEntryPoints. On Windows, the order is
+    // reversed. Failing to follow this order results in crashes (e.g., in Silverlight on Mac and
+    // in Flash and QuickTime on Windows).
+#if PLATFORM(MAC)
+    if (initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR || getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR)
         return false;
+#elif PLATFORM(WIN)
+    if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR || initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)
+        return false;
+#endif
 
     return true;

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-19  Adam Roben  <aroben@apple.com>
+
+        Test that NP_Initialize and NP_GetEntryPoints are called in the
+        correct order
+
+        The order differs between Mac and Windows (see r38858).
+
+        Fixes <http://webkit.org/b/44270> <rdar://problem/8330393> Crash in
+        NP_Initialize when loading QuickTime when running
+        plugins/embed-attributes-setting.html in WebKit2 on Windows
+
+        Reviewed by Sam Weinig.
+
+        * DumpRenderTree/TestNetscapePlugIn/main.cpp: Added a CRASH macro and
+        a boolean to record whether NP_GetEntryPoints has been called.
+        (NP_Initialize): Crash on Windows if NP_GetEntryPoints hasn't been
+        called yet. This matches Flash and QuickTime's behavior. Crash on Mac
+        if NP_GetEntryPoints has been called already. This matches
+        Silverlight's behavior.
+
 2010-08-19  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp

@@ -32 +32 @@
 using namespace std;
 
+#define CRASH() do { \
+    *(int *)(uintptr_t)0xbbadbeef = 0; \
+    ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
+} while(false)
+
+static bool getEntryPointsWasCalled;
+
 #if XP_WIN
 #define STDCALL __stdcall
@@ -48 +55 @@
 NPError STDCALL NP_Initialize(NPNetscapeFuncs *browserFuncs)
 {
+#if XP_WIN
+    // Simulate Flash and QuickTime's behavior of crashing when NP_Initialize is called before NP_GetEntryPoints.
+    if (!getEntryPointsWasCalled)
+        CRASH();
+#elif XP_MACOSX
+    // Simulate Silverlight's behavior of crashing when NP_GetEntryPoints is called before NP_Initialize.
+    if (getEntryPointsWasCalled)
+        CRASH();
+#endif
+
     browser = browserFuncs;
     return NPERR_NO_ERROR;
@@ -55 +72 @@
 NPError STDCALL NP_GetEntryPoints(NPPluginFuncs *pluginFuncs)
 {
+    getEntryPointsWasCalled = true;
+
     pluginFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
     pluginFuncs->size = sizeof(pluginFuncs);