From: Alberto Garcia <berto@igalia.com>
Date: Fri, 6 Mar 2015 07:33:11 +0000 (+0000)
Subject: Fix crash in the Flash plugin
X-Git-Tag: archive/raspbian/2.14.3-1+rpi1~1^2^2^2~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77a143e797a3412cd399740932a1ef90d8a37ab1;p=webkit2gtk.git

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 7014dfcb30..d130906f02 100644
--- 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) {