儲存庫 vbox 的更動 18149

時間撮記:

2009-3-23 下午04:28:11 (16 年 以前)

作者:

vboxsync

訊息:

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

檔案:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (修改) (3 筆差異)

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. */