Changeset 175951 in webkit

Timestamp:

Nov 11, 2014, 9:44:16 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175696 - [GTK] [Stable] webkitgtk 2.6.1 fails to load flashplugin
​https://bugs.webkit.org/show_bug.cgi?id=137849

Reviewed by Carlos Garcia Campos.

NPPVpluginNeedsXEmbed is a boolean value, so it should normally
use an NPBool (1 byte). However some plugins (the Flash player in
particular) are using an int instead, so we have to do it as well
else we'll end up corrupting the stack.

• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:

(WebKit::NetscapePlugin::platformPostInitialize):

Location:

releases/WebKitGTK/webkit-2.6/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-06  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] [Stable] webkitgtk 2.6.1 fails to load flashplugin
+        https://bugs.webkit.org/show_bug.cgi?id=137849
+
+        Reviewed by Carlos Garcia Campos.
+
+        NPPVpluginNeedsXEmbed is a boolean value, so it should normally
+        use an NPBool (1 byte). However some plugins (the Flash player in
+        particular) are using an int instead, so we have to do it as well
+        else we'll end up corrupting the stack.
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::NetscapePlugin::platformPostInitialize):
+
 2014-11-05  Alberto Garcia  <berto@igalia.com>
 

releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

@@ -203 +203 @@
 {
     uint64_t windowID = 0;
-    NPBool needsXEmbed = false;
+    // NPPVpluginNeedsXEmbed is a boolean value, but at least the
+    // Flash player plugin is using an 'int' instead.
+    int needsXEmbed = 0;
     if (m_isWindowed) {
         NPP_GetValue(NPPVpluginNeedsXEmbed, &needsXEmbed);