Changeset 27735 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 26, 2010 12:56:00 PM (15 years ago)

Author:

vboxsync

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

59365

Message:

VMDK: Don't try to read more bytes from the descriptor than the filesize

File:

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

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

@@ -3093 +3093 @@
          * alocate more than 128K, because that's no valid descriptor file
          * and will result in the correct "truncated read" error handling. */
-        uint64_t cbSize;
-        rc = vmdkFileGetSize(pFile, &cbSize);
+        uint64_t cbFileSize;
+        rc = vmdkFileGetSize(pFile, &cbFileSize);
         if (RT_FAILURE(rc))
             goto out;
+
+        uint64_t cbSize = cbFileSize;
         if (cbSize % VMDK_SECTOR2BYTE(10))
             cbSize += VMDK_SECTOR2BYTE(20) - cbSize % VMDK_SECTOR2BYTE(10);
@@ -3112 +3114 @@
         size_t cbRead;
         rc = vmdkFileReadAt(pImage->pFile, 0, pImage->pDescData,
-                            pImage->cbDescAlloc, &cbRead);
+                            RT_MIN(pImage->cbDescAlloc, cbFileSize),
+                            &cbRead);
         if (RT_FAILURE(rc))
         {