Changeset 18149 in vbox for trunk/src

Timestamp:

Mar 23, 2009 4:28:11 PM (16 years ago)

Author:

vboxsync

Message:

Storage/VMDK: fix flush on close without breaking the cleanup when creation failed.

File:

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

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

@@ -2375 +2375 @@
         pDescFile = pImage->pExtents[0].pFile;
     }
+    /* Bail out if there is no file to write to. */
+    if (pDescFile == NULL)
+        return VERR_INVALID_PARAMETER;
     for (unsigned i = 0; i < pImage->Descriptor.cLines; i++)
     {
@@ -3848 +3851 @@
         }
     }
-    /* Don't attempt to flush the image if there is no file - usually happens
-     * when creating fails for whatever reason. */
-    if (pImage->pFile != NULL)
-        (void)vmdkFlushImage(pImage);
+    (void)vmdkFlushImage(pImage);
 
     if (pImage->pExtents != NULL)
@@ -4639 +4639 @@
     pImage->Descriptor.fDirty = true;
     /* Flush the descriptor now, in case it is embedded. */
-    vmdkFlushImage(pImage);
+    (void)vmdkFlushImage(pImage);
 
     /* Close and rename/move extents. */