Changeset 18150 in vbox

Timestamp:

Mar 23, 2009 4:29:52 PM (16 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD: small cleanup in VDClose, don't assert on normal failure path.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (2 diffs)

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

@@ -2125 +2125 @@
 VBOXDDU_DECL(int) VDClose(PVBOXHDD pDisk, bool fDelete)
 {
-    int rc = VINF_SUCCESS;;
+    int rc = VINF_SUCCESS;
 
     LogFlowFunc(("pDisk=%#p fDelete=%d\n", pDisk, fDelete));
@@ -2135 +2135 @@
 
         PVDIMAGE pImage = pDisk->pLast;
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_NOT_OPENED);
+        if (!pImage)
+        {
+            rc = VERR_VD_NOT_OPENED;
+            break;
+        }
         unsigned uOpenFlags = pImage->Backend->pfnGetOpenFlags(pImage->pvBackendData);
         /* Remove image from list of opened images. */