Changeset 8297 in vbox

Timestamp:

Apr 22, 2008 2:30:50 PM (17 years ago)

Author:

vboxsync

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

30051

Message:

Make the vmdk format error checking tighter and fix an annoying gcc warning (only for some gcc versions).

File:

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

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

@@ -3327 +3327 @@
     if (pExtent->pRGD)
         uRGTSector = pExtent->pRGD[uGDIndex];
+    else
+        uRGTSector = 0; /**< avoid compiler warning */
     if (!uGTSector)
     {
@@ -3359 +3361 @@
         if (pExtent->pRGD)
         {
+            AssertReturn(!uRGTSector, VERR_VDI_INVALID_HEADER);
             rc = RTFileGetSize(pExtent->File, &cbExtentSize);
             if (VBOX_FAILURE(rc))
@@ -3364 +3367 @@
             Assert(!(cbExtentSize % 512));
             uRGTSector = VMDK_BYTE2SECTOR(cbExtentSize);
+            /* Normally the redundant grain table is preallocated for hosted
+             * sparse extents that support more than 32 bit sector numbers. So
+             * this shouldn't ever happen on a valid extent. */
+            if (uRGTSector > UINT32_MAX)
+                return VERR_VDI_INVALID_HEADER;
             /* Write backup grain table by writing the required number of grain
              * table cache chunks. Avoids dynamic memory allocation, but is a