Changeset 33191 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 18, 2010 11:49:38 AM (14 years ago)

Author:

vboxsync

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

66728

Message:

Storage/VMDK: fix conditions for reading VMDK footer (regression)

File:

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

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

@@ -2716 +2716 @@
     int rc;
 
-    if (fMagicAlreadyRead)
+    if (!fMagicAlreadyRead)
         rc = vmdkFileReadSync(pImage, pExtent->pFile, 0, &Header,
                               sizeof(Header), NULL);
@@ -2759 +2759 @@
         pExtent->uAppendPosition = RT_ALIGN_64(cbFile, 512);
 
-    if (   !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-        || (   pExtent->fFooter
-            && !(pImage->uOpenFlags & VD_OPEN_FLAGS_SEQUENTIAL)))
+    if (   pExtent->fFooter
+        && (   !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            || !(pImage->uOpenFlags & VD_OPEN_FLAGS_SEQUENTIAL)))
     {
         /* Read the footer, which comes before the end-of-stream marker. */
@@ -3290 +3290 @@
             goto out;
         }
-        rc = vmdkReadBinaryMetaExtent(pImage, pExtent, false /* fMagicAlreadyRead */);
+        rc = vmdkReadBinaryMetaExtent(pImage, pExtent, true /* fMagicAlreadyRead */);
         if (RT_FAILURE(rc))
             goto out;
@@ -3482 +3482 @@
                     }
                     rc = vmdkReadBinaryMetaExtent(pImage, pExtent,
-                                                  true /* fMagicAlreadyRead */);
+                                                  false /* fMagicAlreadyRead */);
                     if (RT_FAILURE(rc))
                         goto out;