Changeset 40843 in vbox for trunk/src/VBox/Storage/VMDK.cpp

Timestamp:

Apr 10, 2012 8:53:19 AM (13 years ago)

Author:

vboxsync

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

77362

Message:

Storage: Miscellaneous bug fixes to make the library work on big endian machines

File:

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

trunk/src/VBox/Storage/VMDK.cpp

@@ -2525 +2525 @@
         goto out;
 
-    if (    RT_LE2H_U32(Header.flags & RT_BIT(17))
+    if (    (RT_LE2H_U32(Header.flags) & RT_BIT(17))
         &&  RT_LE2H_U64(Header.gdOffset) == VMDK_GD_AT_END)
         pExtent->fFooter = true;
@@ -4233 +4233 @@
     PVMDKMARKER pMarker = (PVMDKMARKER)&aMarker[0];
     memset(pMarker, '\0', sizeof(aMarker));
-    pMarker->uSector = RT_H2LE_U64(VMDK_BYTE2SECTOR(pExtent->cGTEntries * sizeof(uint32_t)));
+    pMarker->uSector = RT_H2LE_U64(VMDK_BYTE2SECTOR((uint64_t)pExtent->cGTEntries * sizeof(uint32_t)));
     pMarker->uType = RT_H2LE_U32(VMDK_MARKER_GT);
     rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage, uFileOffset,
@@ -4341 +4341 @@
                 PVMDKMARKER pMarker = (PVMDKMARKER)&aMarker[0];
                 memset(pMarker, '\0', sizeof(aMarker));
-                pMarker->uSector = VMDK_BYTE2SECTOR(RT_ALIGN_64(RT_H2LE_U64(pExtent->cGDEntries * sizeof(uint32_t)), 512));
+                pMarker->uSector = VMDK_BYTE2SECTOR(RT_ALIGN_64(RT_H2LE_U64((uint64_t)pExtent->cGDEntries * sizeof(uint32_t)), 512));
                 pMarker->uType = RT_H2LE_U32(VMDK_MARKER_GD);
                 rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage, uFileOffset,