Title: [167556] trunk/Source/WebKit2
- Revision
- 167556
- Author
- [email protected]
- Date
- 2014-04-19 17:54:04 -0700 (Sat, 19 Apr 2014)
Log Message
Plug-in process crashes if NP_Initialize returns an error the second time it's called
https://bugs.webkit.org/show_bug.cgi?id=131903
<rdar://problem/14355462>
Reviewed by Sam Weinig.
* Shared/Plugins/Netscape/NetscapePluginModule.cpp:
(WebKit::NetscapePluginModule::decrementLoadCount):
Don't try to unload the plug-in if it hasn't been initialized.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167555 => 167556)
--- trunk/Source/WebKit2/ChangeLog 2014-04-20 00:28:30 UTC (rev 167555)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-20 00:54:04 UTC (rev 167556)
@@ -1,3 +1,15 @@
+2014-04-19 Anders Carlsson <[email protected]>
+
+ Plug-in process crashes if NP_Initialize returns an error the second time it's called
+ https://bugs.webkit.org/show_bug.cgi?id=131903
+ <rdar://problem/14355462>
+
+ Reviewed by Sam Weinig.
+
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ (WebKit::NetscapePluginModule::decrementLoadCount):
+ Don't try to unload the plug-in if it hasn't been initialized.
+
2014-04-19 Simon Fraser <[email protected]>
[UI-side compositing] Implement blend modes
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (167555 => 167556)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2014-04-20 00:28:30 UTC (rev 167555)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2014-04-20 00:54:04 UTC (rev 167556)
@@ -131,7 +131,7 @@
size_t pluginModuleIndex = initializedNetscapePluginModules().find(this);
ASSERT(pluginModuleIndex != notFound);
-
+
initializedNetscapePluginModules().remove(pluginModuleIndex);
}
@@ -169,7 +169,7 @@
ASSERT(m_loadCount > 0);
m_loadCount--;
- if (!m_loadCount) {
+ if (!m_loadCount && m_isInitialized) {
shutdown();
unload();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
