Changeset 68826 in vbox

Timestamp:

Sep 22, 2017 1:32:01 PM (8 years ago)

Author:

vboxsync

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

118080

Message:

iprt/isomaker: fixed rock ridge padding bug

File:

• trunk/src/VBox/Runtime/common/fs/isomaker.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/fs/isomaker.cpp

@@ -246 +246 @@
     /** Rock ridge flags (ISO9660RRIP_RR_F_XXX). */
     uint8_t                 fRockEntries;
-    /** Number of rock ridge data bytes in the directory record. */
+    /** Number of rock ridge data bytes in the directory record.  Unaligned! */
     uint8_t                 cbRockInDirRec;
     /** Rock ridge spill file data offset, UINT32_MAX if placed in dir record. */
@@ -4659 +4659 @@
             if (pName->cbDirRec + cbRock < UINT8_MAX)
             {
-                pName->cbRockInDirRec      = cbRock + (cbRock & 1);
+                pName->cbRockInDirRec      = cbRock;
                 pName->cbRockSpill         = 0;
                 pName->fRockNeedRRInDirRec = uRockRidgeLevel >= 2;
@@ -4669 +4669 @@
                 if (uRockRidgeLevel >= 2 && pName->cbDirRec + sizeof(ISO9660SUSPCE) + sizeof(ISO9660RRIPRR) < UINT8_MAX)
                 {
-                    pName->cbRockInDirRec      = RT_ALIGN_T(sizeof(ISO9660SUSPCE) + sizeof(ISO9660RRIPRR), 2, uint16_t);
+                    pName->cbRockInDirRec      = (uint16_t)(sizeof(ISO9660SUSPCE) + sizeof(ISO9660RRIPRR));
                     cbRock -= sizeof(ISO9660RRIPRR);
                     pName->cbRockSpill         = cbRock;
@@ -4677 +4677 @@
                 else
                 {
-                    pName->cbRockInDirRec      = RT_ALIGN_T(sizeof(ISO9660SUSPCE), 2, uint16_t);
+                    pName->cbRockInDirRec      = (uint16_t)sizeof(ISO9660SUSPCE);
                     pName->cbRockSpill         = cbRock;
                     pName->fRockNeedRRInDirRec = false;
@@ -4702 +4702 @@
                 cbRock += sizeof(ISO9660SUSPSP);
                 Assert(pName->cbDirRec + cbRock < UINT8_MAX);
-                pName->cbRockInDirRec       = cbRock + (cbRock & 1);
+                pName->cbRockInDirRec       = cbRock ;
                 pName->cbRockSpill          = 0;
                 pName->fRockNeedER          = false;
@@ -4710 +4710 @@
             else
             {
-                pName->cbRockInDirRec       = RT_ALIGN_T(sizeof(ISO9660SUSPSP) + sizeof(ISO9660SUSPCE), 2, uint16_t);
+                pName->cbRockInDirRec       = (uint16_t)(sizeof(ISO9660SUSPSP) + sizeof(ISO9660SUSPCE));
                 pName->fRockNeedER          = true;
                 pName->fRockNeedRRInSpill   = true;
@@ -4719 +4719 @@
             }
         }
-        pName->cbDirRec += pName->cbRockInDirRec;
+        pName->cbDirRec += pName->cbRockInDirRec + (pName->cbRockInDirRec & 1);
         Assert(pName->cbDirRec < UINT8_MAX);
     }