From df6a041af245ae32fe3bb0664c4f98a787c9e8ca Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 27 Nov 2013 13:31:28 +0100 Subject: Blacklist the skypebuttons plugin Even though plugins are disabled it happens that the libraries are loaded and cause a crash since skypebuttons pulls Qt4 with it on Linux and creates a dynamic linking error conflicting with Qt5 symbols. Add the plugin library name to the blacklist to avoid it being loaded altogether. We have a similar fix in QtWebKit doing the same thing. Reviewed-by: Andras Becsi Change-Id: I45abf31c4e94a8b61aff85765a91436dabae1b2e Reviewed-by: Zeno Albisser --- chromium/content/common/plugin_list_posix.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/content/common/plugin_list_posix.cc b/chromium/content/common/plugin_list_posix.cc index acd7830f738..0e822767c02 100644 --- a/chromium/content/common/plugin_list_posix.cc +++ b/chromium/content/common/plugin_list_posix.cc @@ -151,6 +151,7 @@ bool IsUndesirablePlugin(const WebPluginInfo& info) { // http://code.google.com/p/chromium/issues/detail?id=38229 bool IsBlacklistedPlugin(const base::FilePath& path) { const char* kBlackListedPlugins[] = { + "skypebuttons.so", // Crash on dlopen since it uses Qt4 "nppdf.so", // Adobe PDF }; std::string filename = path.BaseName().value(); -- cgit v1.2.1