Fix crash in the Flash plugin

===================================================================

Gbp-Pq: Name flash-crash.patch

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
index 7014dfcb30c05c572da5607c679b2e1b1b2e6e22..d130906f0256344dfa758c48a67fc6666b26c91e 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
@@ -202,7 +202,9 @@ void NetscapePlugin::platformPreInitialize()
 bool NetscapePlugin::platformPostInitialize()
 {
     uint64_t windowID = 0;
-    bool 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);
         if (needsXEmbed) {