diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-03-18 15:29:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-18 15:50:00 +0100 |
| commit | fa9f68ec24fee49e30d22d0d911853de15a86624 (patch) | |
| tree | a1d1e631fb149e80eacdfafbcda05cdbe2968f90 /Source/WebCore/plugins | |
| parent | 5eedc71730091a63837b0d742bb98517f2ee0c3a (diff) | |
| download | qtwebkit-fa9f68ec24fee49e30d22d0d911853de15a86624.tar.gz | |
[Qt] REGRESSION(r141240) Crash in PluginPackage::fetchInfo
https://bugs.webkit.org/show_bug.cgi?id=111322
Reviewed by Simon Hausmann.
Do not try to load blacklisted plugins.
* plugins/qt/PluginPackageQt.cpp:
(WebCore::PluginPackage::fetchInfo):
Change-Id: If75f30ddc1178ad2a34a0e1924ff711fa695cd99
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144627 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/WebCore/plugins')
| -rw-r--r-- | Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp index c5112f525..679480bd5 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp @@ -39,6 +39,8 @@ namespace WebCore { bool PluginPackage::fetchInfo() { if (!m_module) { + if (isPluginBlacklisted()) + return false; m_module = new QLibrary((QString)m_path); m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint); if (!m_module->load()) { |