Changeset 26376 in webkit

Timestamp:

Oct 11, 2007 5:16:56 PM (17 years ago)

Author:

honeycutt

Message:

2007-10-11 Jon Honeycutt <​jhoneycutt@apple.com>

Reviewed by Anders.

Handle a race condition that could arise if a plugin was loaded while it
was scheduled to be freed: check whether the timer that schedules
library frees is active in PluginPackageWin::load().

• plugins/win/PluginPackageWin.cpp: (WebCore::PluginPackageWin::freeLibrarySoon): Added assertions (WebCore::PluginPackageWin::freeLibraryTimerFired): Added assertion (WebCore::PluginPackageWin::load): If we are scheduled to free this library, cancel the timer, and don't call LoadLibrary

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/win/PluginPackageWin.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-11  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Reviewed by Anders.
+
+        Handle a race condition that could arise if a plugin was loaded while it
+        was scheduled to be freed: check whether the timer that schedules
+        library frees is active in PluginPackageWin::load().
+
+        * plugins/win/PluginPackageWin.cpp:
+        (WebCore::PluginPackageWin::freeLibrarySoon): Added assertions
+        (WebCore::PluginPackageWin::freeLibraryTimerFired): Added assertion
+        (WebCore::PluginPackageWin::load): If we are scheduled to free this
+        library, cancel the timer, and don't call LoadLibrary
+
 2007-10-11  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/plugins/win/PluginPackageWin.cpp

@@ -84 +84 @@
 void PluginPackageWin::freeLibrarySoon()
 {
+    ASSERT(!m_freeLibraryTimer.isActive());
+    ASSERT(m_module);
+    ASSERT(m_loadCount == 0);
+
     m_freeLibraryTimer.startOneShot(0);
 }
@@ -90 +94 @@
 {
     ASSERT(m_module);
-
-    FreeLibrary(m_module);
+    ASSERT(m_loadCount == 0);
+
+    ::FreeLibrary(m_module);
     m_module = 0;
 }
@@ -158 +163 @@
 bool PluginPackageWin::load()
 {
-    if (m_isLoaded) {
+    if (m_freeLibraryTimer.isActive()) {
+        ASSERT(m_module);
+        m_freeLibraryTimer.stop();
+    } else if (m_isLoaded) {
         m_loadCount++;
         return true;
-    }
-
-    WCHAR currentPath[MAX_PATH];
-
-    if (!::GetCurrentDirectoryW(MAX_PATH, currentPath))
-        return false;
-
-    String path = m_path.substring(0, m_path.reverseFind('\\'));
-
-    if (!::SetCurrentDirectoryW(path.charactersWithNullTermination()))
-        return false;
-
-    // Load the library
-    m_module = ::LoadLibraryW(m_path.charactersWithNullTermination());
-
-    if (!::SetCurrentDirectoryW(currentPath)) {
-        if (m_module)
-            ::FreeLibrary(m_module);
-        return false;
+    } else {
+        WCHAR currentPath[MAX_PATH];
+
+        if (!::GetCurrentDirectoryW(MAX_PATH, currentPath))
+            return false;
+
+        String path = m_path.substring(0, m_path.reverseFind('\\'));
+
+        if (!::SetCurrentDirectoryW(path.charactersWithNullTermination()))
+            return false;
+
+        // Load the library
+        m_module = ::LoadLibraryW(m_path.charactersWithNullTermination());
+
+        if (!::SetCurrentDirectoryW(currentPath)) {
+            if (m_module)
+                ::FreeLibrary(m_module);
+            return false;
+        }
     }