Changeset 83728 in webkit

Timestamp:

Apr 13, 2011 7:05:15 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-13 Gustavo Noronha Silva <Gustavo Noronha Silva>

Reviewed by Martin Robinson.

[GTK] PluginPackage should check whether a plugin mixes GTK+ 2 and 3 symbols itself
​https://bugs.webkit.org/show_bug.cgi?id=58297

Make sure we do not load plugins that use symbols of a different
GTK+ major version to avoid bugs and crashes.

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

2011-04-13 Gustavo Noronha Silva <Gustavo Noronha Silva>

Reviewed by Martin Robinson.

[GTK] PluginPackage should check whether a plugin mixes GTK+ 2 and 3 symbols itself
​https://bugs.webkit.org/show_bug.cgi?id=58297

Do not disable flash specifically when built with GTK+ 3 -
PluginPackage should do the right thing while loading plugins.

• GtkLauncher/main.c: (main):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/plugins/gtk/PluginPackageGtk.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/GtkLauncher/main.c (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] PluginPackage should check whether a plugin mixes GTK+ 2 and 3 symbols itself
+        https://bugs.webkit.org/show_bug.cgi?id=58297
+
+        Make sure we do not load plugins that use symbols of a different
+        GTK+ major version to avoid bugs and crashes.
+
+        * plugins/gtk/PluginPackageGtk.cpp:
+        (WebCore::moduleMixesGtkSymbols):
+        (WebCore::PluginPackage::load):
+
 2011-04-13  Andrey Adaikin  <aandrey@google.com>
 

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

@@ -120 +120 @@
 #endif
 
+static bool moduleMixesGtkSymbols(GModule* module)
+{
+    gpointer symbol;
+#ifdef GTK_API_VERSION_2
+    return g_module_symbol(module, "gtk_application_get_type", &symbol);
+#else
+    return g_module_symbol(module, "gtk_object_get_type", &symbol);
+#endif
+}
+
+
 bool PluginPackage::load()
 {
@@ -151 +162 @@
     }
 
+    if (moduleMixesGtkSymbols(m_module)) {
+        LOG(Plugins, "Module '%s' mixes GTK+ 2 and GTK+ 3 symbols, ignoring plugin.\n", m_path.utf8().data());
+        g_module_close(m_module);
+        return false;
+    }
+
     m_isLoaded = true;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-13  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] PluginPackage should check whether a plugin mixes GTK+ 2 and 3 symbols itself
+        https://bugs.webkit.org/show_bug.cgi?id=58297
+
+        Do not disable flash specifically when built with GTK+ 3 -
+        PluginPackage should do the right thing while loading plugins.
+
+        * GtkLauncher/main.c:
+        (main):
+
 2011-04-12  Kent Tamura  <tkent@chromium.org>
 

trunk/Tools/GtkLauncher/main.c

@@ -231 +231 @@
 }
 
-#ifndef GTK_API_VERSION_2
-static void disablePlugin(const char* pluginName)
-{
-    WebKitWebPluginDatabase *database = webkit_get_web_plugin_database();
-    GSList *plugins = webkit_web_plugin_database_get_plugins(database);
-    GSList *p;
-
-    for (p = plugins; p; p = g_slist_next(p)) {
-        WebKitWebPlugin *plugin = WEBKIT_WEB_PLUGIN(p->data);
-
-        if (!g_strcmp0(webkit_web_plugin_get_name(plugin), pluginName))
-            webkit_web_plugin_set_enabled(plugin, FALSE);
-    }
-
-    webkit_web_plugin_database_plugins_list_free(plugins);
-}
-#endif
-
 int main(int argc, char* argv[])
 {
@@ -258 +240 @@
         g_thread_init(NULL);
 
-#ifndef GTK_API_VERSION_2
-    disablePlugin("Shockwave Flash");
-#endif
-
     main_window = createWindow(&webView);