Changeset 94279 in vbox for trunk/src/VBox/Runtime/common/fs

Timestamp:

Mar 17, 2022 1:34:09 AM (3 years ago)

Author:

vboxsync

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

150543

Message:

IPRT/isomakerimport.cpp: A couple of rock ridge parsing corrections.

File:

• trunk/src/VBox/Runtime/common/fs/isomakerimport.cpp (modified) (8 diffs)

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

@@ -179 +179 @@
     /** Symlink target name buffer for rock ridge.  */
     char                szRockSymlinkTargetBuf[_2K];
-    /** A buffer for reading rock ridge continuation blocks into   */
+    /** A buffer for reading rock ridge continuation blocks into. */
     uint8_t             abRockBuf[ISO9660_SECTOR_SIZE];
     /** @} */
@@ -641 +641 @@
     RT_NOREF(pObjInfo);
 
-    /*
-     * Do skipping if specified.
-     */
-    if (pThis->offSuspSkip)
-    {
-        if (cbSys <= pThis->offSuspSkip)
-            return;
-        pbSys += pThis->offSuspSkip;
-        cbSys -= pThis->offSuspSkip;
-    }
-
     while (cbSys >= 4)
     {
@@ -658 +647 @@
          */
         PCISO9660SUSPUNION pUnion = (PCISO9660SUSPUNION)pbSys;
-        if (pUnion->Hdr.cbEntry > cbSys)
+        if (   pUnion->Hdr.cbEntry > cbSys
+            && pUnion->Hdr.cbEntry < sizeof(pUnion->Hdr))
         {
             LogRel(("rtFsIsoImportProcessIso9660TreeWorkerParseRockRidge: cbEntry=%#x cbSys=%#x (%#x %#x)\n",
@@ -1014 +1004 @@
 
                     /* Purge the encoding as we don't want invalid UTF-8 floating around. */
+                    /** @todo do this afterwards as needed. */
                     RTStrPurgeEncoding(pThis->szRockSymlinkTargetBuf);
                 }
@@ -1036 +1027 @@
                     if (pUnion->NM.fFlags & (ISO9660RRIP_NM_F_CURRENT | ISO9660RRIP_NM_F_PARENT))
                     {
-                        if (cchName == 0 && pThis->szRockNameBuf[0] == '\0')
+                        if (cchName == 0)
                             Log(("rtFsIsoImport/Rock: Ignoring 'NM' entry for '.' and '..'\n"));
                         else
@@ -1053 +1044 @@
 
                             /* Purge the encoding as we don't want invalid UTF-8 floating around. */
-                            RTStrPurgeEncoding(pThis->szRockSymlinkTargetBuf);
+                            /** @todo do this afterwards as needed. */
+                            RTStrPurgeEncoding(pThis->szRockNameBuf);
                         }
                         else
@@ -1483 +1475 @@
             pThis->szRockNameBuf[0] = '\0';
             pThis->szRockSymlinkTargetBuf[0] = '\0';
-            if (cbSys > 0 && !(pThis->fFlags & RTFSISOMK_IMPORT_F_NO_ROCK_RIDGE))
+            if (   cbSys > pThis->offSuspSkip
+                && !(pThis->fFlags & RTFSISOMK_IMPORT_F_NO_ROCK_RIDGE))
             {
                 pThis->fSeenLastNM               = false;
@@ -1489 +1482 @@
                 pThis->szRockNameBuf[0]          = '\0';
                 pThis->szRockSymlinkTargetBuf[0] = '\0';
-                rtFsIsoImportProcessIso9660TreeWorkerParseRockRidge(pThis, &ObjInfo, pbSys, cbSys, fUnicode,
+                rtFsIsoImportProcessIso9660TreeWorkerParseRockRidge(pThis, &ObjInfo, &pbSys[pThis->offSuspSkip],
+                                                                    cbSys - pThis->offSuspSkip, fUnicode,
                                                                     false /*fContinuationRecord*/, false /*fIsFirstDirRec*/);
             }