Changeset 91062 in webkit

Timestamp:

Jul 15, 2011 3:40:36 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

Reviewed by Martin Robinson.

[GTK] Install a custom X error handler in plugin process
​https://bugs.webkit.org/show_bug.cgi?id=63248

Some plugins, specially flash, can cause X errors that when
handled by the default X error handler (or the GDK one) abort the
process. Since we don't want to crash due to buggy plugins, we
install a custom error handler to show a warning when a X error
happens without aborting.

• PluginProcess/gtk/PluginProcessMainGtk.cpp:

(WebKit::webkitgtkXError):
(WebKit::PluginProcessMainGtk):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/gtk/PluginProcessMainGtk.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Install a custom X error handler in plugin process
+        https://bugs.webkit.org/show_bug.cgi?id=63248
+
+        Some plugins, specially flash, can cause X errors that when
+        handled by the default X error handler (or the GDK one) abort the
+        process. Since we don't want to crash due to buggy plugins, we
+        install a custom error handler to show a warning when a X error
+        happens without aborting.
+
+        * PluginProcess/gtk/PluginProcessMainGtk.cpp:
+        (WebKit::webkitgtkXError):
+        (WebKit::PluginProcessMainGtk):
+
 2011-07-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp

@@ -29 +29 @@
 #include "PluginProcess.h"
 #include <WebKit2/RunLoop.h>
+#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <runtime/InitializeThreading.h>
@@ -34 +35 @@
 
 namespace WebKit {
+
+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 a browser 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;
+}
 
 WK_EXPORT int PluginProcessMainGtk(int argc, char* argv[])
@@ -45 +60 @@
     RunLoop::initializeMainRunLoop();
 
+    // Plugins 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 plugin bugs, we install a
+    // custom error handler to show a warning when a X error happens without aborting.
+    XSetErrorHandler(webkitgtkXError);
+
     int socket = atoi(argv[1]);
     WebKit::PluginProcess::shared().initialize(socket, RunLoop::main());