Changeset 78356 in vbox for trunk/src

Timestamp:

Apr 30, 2019 9:02:35 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/isovfs.cpp: Ignore 2nd primary descriptor.

File:

• trunk/src/VBox/Runtime/common/fs/isovfs.cpp (modified) (1 diff)

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

@@ -5705 +5705 @@
                 rtFsIsoVolLogPrimarySupplementaryVolDesc(&Buf.SupVolDesc);
 #endif
-                if (cPrimaryVolDescs > 1)
+                if (cPrimaryVolDescs == 1)
+                    rc = rtFsIsoVolHandlePrimaryVolDesc(pThis, &Buf.PrimaryVolDesc, offVolDesc, &RootDir, &offRootDirRec, pErrInfo);
+                else if (cPrimaryVolDescs == 2)
+                    Log(("ISO9660: ignoring 2nd primary descriptor\n")); /* so we can read the w2k3 ifs kit */
+                else
                     return RTERRINFO_LOG_SET(pErrInfo, VERR_VFS_UNSUPPORTED_FORMAT, "More than one primary volume descriptor");
-                rc = rtFsIsoVolHandlePrimaryVolDesc(pThis, &Buf.PrimaryVolDesc, offVolDesc, &RootDir, &offRootDirRec, pErrInfo);
             }
             else if (Buf.VolDescHdr.bDescType == ISO9660VOLDESC_TYPE_SUPPLEMENTARY)