summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-11-27 13:31:28 +0100
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-02-13 10:24:52 +0100
commitcabdbed101df2a7609ed8b1d4c84438424f9a5a9 (patch)
tree86085d921b0e22e885fdce265043ba3851e5f688
parentafcf184b4a6daf90519a79f1fde5e2a8c026643c (diff)
downloadqtwebengine-chromium-cabdbed101df2a7609ed8b1d4c84438424f9a5a9.tar.gz
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. Change-Id: I6706d45d1f19252d3b60af7b97c0a3a729dfe8b7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--chromium/content/common/plugin_list_posix.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/content/common/plugin_list_posix.cc b/chromium/content/common/plugin_list_posix.cc
index 3e1353bef79..7c04485ce9a 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();