Changeset 67326 in vbox for trunk

Timestamp:

Jun 9, 2017 7:37:52 PM (8 years ago)

Author:

vboxsync

Message:

iso9660.h,iso9660vfs.cpp: Corrected the extended attribute length member of the directory records.

Location:

trunk

Files:

• include/iprt/formats/iso9660.h (modified) (1 diff)
• src/VBox/Runtime/common/fs/iso9660vfs.cpp (modified) (3 diffs)

trunk/include/iprt/formats/iso9660.h

@@ -155 +155 @@
     /** 0x00: Length of this record in bytes. */
     uint8_t             cbDirRec;
-    /** 0x01: Extended attribute record length in bytes? */
-    uint8_t             cbExtAttr;
+    /** 0x01: Extended attribute record length in logical blocks. */
+    uint8_t             cExtAttrBlocks;
     /** 0x02: Location of extent (logical block number).
      * @note Misaligned. */

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

@@ -278 +278 @@
     pCore->cExtents             = 1;
     pCore->FirstExtent.cbExtent = pCore->cbObject;
-    pCore->FirstExtent.offDisk  = ISO9660_GET_ENDIAN(&pDirRec->offExtent) * (uint64_t)pVol->cbBlock;
+    pCore->FirstExtent.offDisk  = (ISO9660_GET_ENDIAN(&pDirRec->offExtent) + pDirRec->cExtAttrBlocks) * (uint64_t)pVol->cbBlock;
 
     rtFsIso9660DateTime2TimeSpec(&pCore->ModificationTime, &pDirRec->RecTime);
@@ -1441 +1441 @@
                   offRec,
                   pDirRec->cbDirRec,
-                  pDirRec->cbExtAttr,
+                  pDirRec->cExtAttrBlocks,
                   ISO9660_GET_ENDIAN(&pDirRec->cbData),
                   ISO9660_GET_ENDIAN(&pDirRec->offExtent),
@@ -1747 +1747 @@
 
         Log2(("ISO9660:  RootDir.cbDirRec:                   %#RX8\n", pVolDesc->RootDir.DirRec.cbDirRec));
-        Log2(("ISO9660:  RootDir.cbExtAttr:                  %#RX8\n", pVolDesc->RootDir.DirRec.cbExtAttr));
+        Log2(("ISO9660:  RootDir.cExtAttrBlocks:             %#RX8\n", pVolDesc->RootDir.DirRec.cExtAttrBlocks));
         Log2(("ISO9660:  RootDir.offExtent:                  {%#RX32,%#RX32}\n", RT_BE2H_U32(pVolDesc->RootDir.DirRec.offExtent.be), RT_LE2H_U32(pVolDesc->RootDir.DirRec.offExtent.le)));
         Log2(("ISO9660:  RootDir.cbData:                     {%#RX32,%#RX32}\n", RT_BE2H_U32(pVolDesc->RootDir.DirRec.cbData.be), RT_LE2H_U32(pVolDesc->RootDir.DirRec.cbData.le)));