Changeset 64765 in vbox

Timestamp:

Nov 30, 2016 10:28:00 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112110

Message:

Storage/VD: (bugref:8685) Fixed VBoxSVC crash on removing extpack while no VD plugins are loaded.

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -3597 +3597 @@
  * Checks whether the given plugin filename was already loaded.
  *
- * @returns true if the plugin was already loaded, false otherwise.
+ * @returns Pointer to already loaded plugin, NULL if not found.
  * @param   pszFilename    The filename to check.
  */
-static bool vdPluginFind(const char *pszFilename)
+static PVDPLUGIN vdPluginFind(const char *pszFilename)
 {
     PVDPLUGIN pIt = NULL;
@@ -3607 +3607 @@
     {
         if (!RTStrCmp(pIt->pszFilename, pszFilename))
-            return true;
-    }
-
-    return false;
+            return pIt;
+    }
+
+    return NULL;
 }
 
@@ -3646 +3646 @@
 {
     /* Find plugin to be removed from the list. */
-    PVDPLUGIN pIt = NULL;
-    RTListForEach(&g_ListPluginsLoaded, pIt, VDPLUGIN, NodePlugin)
-    {
-        if (!RTStrCmp(pIt->pszFilename, pszFilename))
-            break;
-    }
+    PVDPLUGIN pIt = vdPluginFind(pszFilename);
     if (!pIt)
         return VINF_SUCCESS;