Changeset 9975 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jun 26, 2008 6:26:34 PM (17 years ago)

Author:

vboxsync

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

32413

Message:

Fix incorrect 63 sector minimum logical partition start offset. Also separate sorting from consistency checking.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -568 +568 @@
             pCP->uEndSector = p[6] & 0x3f;
             uint32_t uStartOffset = RT_MAKE_U32_FROM_U8(p[8], p[9], p[10], p[11]);
+            if (!uStartOffset)
+            {
+                RTPrintf("Invalid partition start offset. Aborting\n");
+                return VERR_INVALID_PARAMETER;
+            }
             pCP->uStart = uStart + uOffset + uStartOffset;
             pCP->uSize = RT_MAKE_U32_FROM_U8(p[12], p[13], p[14], p[15]);
             /* Fill out partitioning location info for EBR. */
             pCP->uPartDataStart = uStart + uOffset;
-            pCP->cPartDataSectors = RT_MIN(uStartOffset, 63);
+            pCP->cPartDataSectors = uStartOffset;
             p += 16;
             if (p[4] == 0)
@@ -589 +594 @@
     }
 
-    /* Sort partitions in ascending order of start sector. Also do a lot of
-     * consistency checking. */
-    uint64_t uPrevEnd = 0;
+    /* Sort partitions in ascending order of start sector, plus a trivial
+     * bit of consistency checking. */
     for (unsigned i = 0; i < pPart->cPartitions-1; i++)
     {
@@ -623 +627 @@
                    &pPart->aPartitions[pPart->cPartitions], sizeof(HOSTPARTITION));
         }
+    }
+
+    /* Now do a lot of consistency checking. */
+    uint64_t uPrevEnd = 0;
+    for (unsigned i = 0; i < pPart->cPartitions-1; i++)
+    {
         if (pPart->aPartitions[i].cPartDataSectors)
         {
@@ -643 +653 @@
     /* Fill out partitioning location info for MBR. */
     pPart->aPartitions[0].uPartDataStart = 0;
-    pPart->aPartitions[0].cPartDataSectors = RT_MIN(pPart->aPartitions[0].uStart, 63);
+    pPart->aPartitions[0].cPartDataSectors = pPart->aPartitions[0].uStart;
 
     return VINF_SUCCESS;