Changeset 33186 in vbox

Timestamp:

Oct 18, 2010 9:26:01 AM (14 years ago)

Author:

vboxsync

Message:

Storage/VMDK: read streamOptimized images to the very end

File:

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

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

@@ -5611 +5611 @@
                                       &Marker.uType, sizeof(Marker.uType),
                                       NULL);
+                if (RT_FAILURE(rc))
+                    return rc;
                 Marker.uType = RT_LE2H_U32(Marker.uType);
                 switch (Marker.uType)
@@ -5616 +5618 @@
                     case VMDK_MARKER_EOS:
                         uGrainSectorAbs++;
+                        /* Read (or mostly skip) to the end of file. Uses the
+                         * Marker (LBA sector) as it is unused anyway. This
+                         * makes sure that really everything is read in the
+                         * success case. If this read fails it means the image
+                         * is truncated, but this is harmless so ignore. */
+                        vmdkFileReadSync(pImage, pExtent->pFile,
+                                           VMDK_SECTOR2BYTE(uGrainSectorAbs)
+                                         + 511,
+                                         &Marker.uSector, 1, NULL);
                         break;
                     case VMDK_MARKER_GT: