Title: [144627] trunk/Source/WebCore
- Revision
- 144627
- Author
- [email protected]
- Date
- 2013-03-04 07:53:02 -0800 (Mon, 04 Mar 2013)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144626 => 144627)
--- trunk/Source/WebCore/ChangeLog 2013-03-04 15:09:04 UTC (rev 144626)
+++ trunk/Source/WebCore/ChangeLog 2013-03-04 15:53:02 UTC (rev 144627)
@@ -1,3 +1,15 @@
+2013-03-04 Allan Sandfeld Jensen <[email protected]>
+
+ [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):
+
2013-03-04 Alexis Menard <[email protected]>
transition properties can't be found in CSSStyleDeclaration
Modified: trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp (144626 => 144627)
--- trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-03-04 15:09:04 UTC (rev 144626)
+++ trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-03-04 15:53:02 UTC (rev 144627)
@@ -39,6 +39,8 @@
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()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
