Changeset 33816 in vbox for trunk/src/VBox/Storage/DMG.cpp

Timestamp:

Nov 5, 2010 10:11:03 PM (14 years ago)

Author:

vboxsync

Message:

DMG: Check for the magic values before converting the footer structure to host endian byte order to avoid assertions if an image with another format is checked

File:

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

trunk/src/VBox/Storage/DMG.cpp

@@ -751 +751 @@
 
         default:
-//            AssertMsgFailed(("%x\n", u32Kind));
+            AssertMsgFailed(("%x\n", u32Kind));
             break;
     }
@@ -1634 +1634 @@
     if (RT_SUCCESS(rc))
     {
-        dmgUdifFtrFile2HostEndian(&Ftr);
-
         /*
          * Do we recognize this stuff? Does it look valid?
          */
-        if (    Ftr.u32Magic    == DMGUDIF_MAGIC
-            &&  Ftr.u32Version  == DMGUDIF_VER_CURRENT
-            &&  Ftr.cbFooter    == sizeof(Ftr))
+        if (    Ftr.u32Magic    == RT_H2BE_U32(DMGUDIF_MAGIC)
+            &&  Ftr.u32Version  == RT_H2BE_U32(DMGUDIF_VER_CURRENT)
+            &&  Ftr.cbFooter    == RT_H2BE_U32(sizeof(Ftr)))
         {
+            dmgUdifFtrFile2HostEndian(&Ftr);
             if (dmgUdifFtrIsValid(&Ftr, offFtr))
             {