Changeset 167556 in webkit


Ignore:
Timestamp:
Apr 19, 2014 5:54:04 PM (10 years ago)
Author:
andersca@apple.com
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.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r167553 r167556  
     12014-04-19  Anders Carlsson  <andersca@apple.com>
     2
     3        Plug-in process crashes if NP_Initialize returns an error the second time it's called
     4        https://bugs.webkit.org/show_bug.cgi?id=131903
     5        <rdar://problem/14355462>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
     10        (WebKit::NetscapePluginModule::decrementLoadCount):
     11        Don't try to unload the plug-in if it hasn't been initialized.
     12
    1132014-04-19  Simon Fraser  <simon.fraser@apple.com>
    214
  • trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp

    r161045 r167556  
    132132    size_t pluginModuleIndex = initializedNetscapePluginModules().find(this);
    133133    ASSERT(pluginModuleIndex != notFound);
    134    
     134
    135135    initializedNetscapePluginModules().remove(pluginModuleIndex);
    136136}
     
    170170    m_loadCount--;
    171171   
    172     if (!m_loadCount) {
     172    if (!m_loadCount && m_isInitialized) {
    173173        shutdown();
    174174        unload();
Note: See TracChangeset for help on using the changeset viewer.