Changeset 76904 in vbox

Timestamp:

Jan 20, 2019 7:48:25 PM (6 years ago)

Author:

vboxsync

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

128272

Message:

Storage/VMDK: Don't try to flush the image when closing it after opening failed due to an invalid format caused by data corruption

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (11 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -539 +539 @@
 static int vmdkFlushImage(PVMDKIMAGE pImage, PVDIOCTX pIoCtx);
 static int vmdkSetImageComment(PVMDKIMAGE pImage, const char *pszComment);
-static int vmdkFreeImage(PVMDKIMAGE pImage, bool fDelete);
+static int vmdkFreeImage(PVMDKIMAGE pImage, bool fDelete, bool fFlush);
 
 static DECLCALLBACK(int) vmdkAllocGrainComplete(void *pBackendData, PVDIOCTX pIoCtx,
@@ -3365 +3365 @@
     }
     else
-        vmdkFreeImage(pImage, false);
+        vmdkFreeImage(pImage, false, false /*fFlush*/); /* Don't try to flush anything if opening failed. */
     return rc;
 }
@@ -4093 +4093 @@
     }
     else
-        vmdkFreeImage(pImage, rc != VERR_ALREADY_EXISTS);
+        vmdkFreeImage(pImage, rc != VERR_ALREADY_EXISTS, false /*fFlush*/);
     return rc;
 }
@@ -4207 +4207 @@
  * delete the image from disk.
  */
-static int vmdkFreeImage(PVMDKIMAGE pImage, bool fDelete)
+static int vmdkFreeImage(PVMDKIMAGE pImage, bool fDelete, bool fFlush)
 {
     int rc = VINF_SUCCESS;
@@ -4317 +4317 @@
             }
         }
-        else if (!fDelete)
+        else if (!fDelete && fFlush)
             vmdkFlushImage(pImage, NULL);
 
@@ -5208 +5208 @@
          * much as possible in vmdkOpenImage. */
         rc = vmdkOpenImage(pImage, VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_READONLY);
-        vmdkFreeImage(pImage, false);
+        vmdkFreeImage(pImage, false, false /*fFlush*/);
         RTMemFree(pImage);
 
@@ -5332 +5332 @@
                 if (uOpenFlags & VD_OPEN_FLAGS_READONLY)
                 {
-                    vmdkFreeImage(pImage, false);
+                    vmdkFreeImage(pImage, false, true /*fFlush*/);
                     rc = vmdkOpenImage(pImage, uOpenFlags);
                 }
@@ -5495 +5495 @@
          * re-open the whole thing later.
          */
-        vmdkFreeImage(pImage, false);
+        vmdkFreeImage(pImage, false, true /*fFlush*/);
     }
 
@@ -5606 +5606 @@
         {
             /* Release all old stuff. */
-            rc = vmdkFreeImage(pImage, false);
+            rc = vmdkFreeImage(pImage, false, true /*fFlush*/);
             if (RT_SUCCESS(rc))
             {
@@ -5679 +5679 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
 
-    int rc = vmdkFreeImage(pImage, fDelete);
+    int rc = vmdkFreeImage(pImage, fDelete, true /*fFlush*/);
     RTMemFree(pImage);
 
@@ -6150 +6150 @@
         {
             /* Implement this operation via reopening the image. */
-            vmdkFreeImage(pImage, false);
+            vmdkFreeImage(pImage, false, true /*fFlush*/);
             rc = vmdkOpenImage(pImage, uOpenFlags);
         }