Changeset 34581 in vbox

Timestamp:

Dec 1, 2010 4:43:39 PM (14 years ago)

Author:

vboxsync

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

68376

Message:

Storage/VMDK: reading of fixed image descriptor files needs to handle the sequential case

File:

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

trunk/src/VBox/Storage/VMDK.cpp

@@ -3330 +3330 @@
             goto out;
 
+        /* If the descriptor file is shorter than 50 bytes it can't be valid. */
+        if (cbFileSize < 50)
+        {
+            rc = vmdkError(pImage, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: descriptor in '%s' is too short"), pImage->pszFilename);
+            goto out;
+        }
+
         uint64_t cbSize = cbFileSize;
         if (cbSize % VMDK_SECTOR2BYTE(10))
@@ -3344 +3351 @@
         }
 
+        /* Don't reread the place where the magic would live in a sparse
+         * image if it's a descriptor based one. */
+        memcpy(pImage->pDescData, &u32Magic, sizeof(u32Magic));
         size_t cbRead;
-        rc = vmdkFileReadSync(pImage, pImage->pFile, 0, pImage->pDescData,
-                              RT_MIN(pImage->cbDescAlloc, cbFileSize),
+        rc = vmdkFileReadSync(pImage, pImage->pFile, sizeof(u32Magic),
+                              pImage->pDescData + sizeof(u32Magic),
+                              RT_MIN(pImage->cbDescAlloc - sizeof(u32Magic),
+                                     cbFileSize - sizeof(u32Magic)),
                               &cbRead);
         if (RT_FAILURE(rc))
@@ -3353 +3365 @@
             goto out;
         }
+        cbRead += sizeof(u32Magic);
         if (cbRead == pImage->cbDescAlloc)
         {