Changeset 4798 in vbox

Timestamp:

Sep 14, 2007 2:24:32 PM (17 years ago)

Author:

vboxsync

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

24500

Message:

fixed annoying debug assertion.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -102 +102 @@
 
     /** Handle for the shared object / DLL. */
-    RTLDRMOD            pluginHandle;
+    RTLDRMOD            hPlugin;
     /** Function pointers for the various backend methods. */
     PVBOXHDDBACKEND     Backend;
@@ -494 +494 @@
     if (!pBackend)
     {
-        RTLDRMOD ldrHandle;
+        RTLDRMOD hPlugin;
         char *pszPluginName;
         int cbPluginName;
@@ -509 +509 @@
         {
             /* try to load the plugin (RTldrLoad appends the suffix for the shared object/DLL). */
-            rc = RTLdrLoad(pszPluginName, &ldrHandle);
+            rc = RTLdrLoad(pszPluginName, &hPlugin);
             if (VBOX_SUCCESS(rc))
             {
                 PFNVBOXHDDFORMATLOAD pfnHDDFormatLoad;
 
-                rc = RTLdrGetSymbol (ldrHandle, VBOX_HDDFORMAT_LOAD_NAME, (void**)&pfnHDDFormatLoad);
-                if (VBOX_FAILURE(rc) || !pfnHDDFormatLoad)
+                rc = RTLdrGetSymbol(hPlugin, VBOX_HDDFORMAT_LOAD_NAME, (void**)&pfnHDDFormatLoad);
+                if (VBOX_FAILURE(rc))
                 {
                     Log(("%s: Error resolving the entry point %s, rc = %d, pfnHDDFormat = %p\n", VBOX_HDDFORMAT_LOAD_NAME, rc, pfnHDDFormatLoad));
@@ -561 +561 @@
             pDisk->pvErrorUser  = pvErrorUser;
             pDisk->Backend      = pBackend;
+            pDisk->hPlugin      = NIL_RTLDRMOD;
             *ppDisk = pDisk;
         }
@@ -591 +592 @@
     {
         VDCloseAll(pDisk);
-        RTLdrClose(pDisk->pluginHandle);
+        if (pDisk->hPlugin != NIL_RTLDRMOD)
+        {
+            RTLdrClose(pDisk->hPlugin);
+            pDisk->hPlugin = NIL_RTLDRMOD;
+        }
         RTMemFree(pDisk->Backend);
         RTMemFree(pDisk);