Changeset 76578 in webkit

Timestamp:

Jan 25, 2011 12:43:48 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-01-25 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Crash in some pages containing flash
​https://bugs.webkit.org/show_bug.cgi?id=53016

Flash plugin can produce X errors that are handled by the GDK X
error handler, which exits the process. Since we don't want to
crash due to flash bugs, we install a custom error handler to show
a warning when a X error happens without aborting.

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Crash in some pages containing flash
+        https://bugs.webkit.org/show_bug.cgi?id=53016
+
+        Flash plugin can produce X errors that are handled by the GDK X
+        error handler, which exits the process. Since we don't want to
+        crash due to flash bugs, we install a custom error handler to show
+        a warning when a X error happens without aborting.
+
+        * plugins/gtk/PluginPackageGtk.cpp:
+        (WebCore::webkitgtkXError):
+        (WebCore::PluginPackage::load):
+
 2011-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp

@@ -105 +105 @@
 }
 
+#if defined(XP_UNIX)
+static int webkitgtkXError(Display* xdisplay, XErrorEvent* error)
+{
+    gchar errorMessage[64];
+    XGetErrorText(xdisplay, error->error_code, errorMessage, 63);
+    g_warning("The program '%s' received an X Window System error.\n"
+              "This probably reflects a bug in the Adobe Flash plugin.\n"
+              "The error was '%s'.\n"
+              "  (Details: serial %ld error_code %d request_code %d minor_code %d)\n",
+              g_get_prgname(), errorMessage,
+              error->serial, error->error_code,
+              error->request_code, error->minor_code);
+    return 0;
+}
+#endif
+
 bool PluginPackage::load()
 {
@@ -138 +154 @@
     m_isLoaded = true;
 
+#if defined(XP_UNIX)
+    if (!g_strcmp0(baseName.get(), "libflashplayer.so")) {
+        // Flash plugin can produce X errors that are handled by the GDK X error handler, which
+        // exits the process. Since we don't want to crash due to flash bugs, we install a
+        // custom error handler to show a warning when a X error happens without aborting.
+        XSetErrorHandler(webkitgtkXError);
+    }
+#endif
+
     NP_InitializeFuncPtr NP_Initialize = 0;
     m_NPP_Shutdown = 0;