Changeset 71002 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 13, 2018 7:04:56 PM (7 years ago)

Author:

vboxsync

Message:

iosmakerimport.cpp: Fixed assertion in boot catalog parsing code for old RHEL5 images. Just consider all zero entries as terminal.

File:

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

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

@@ -2448 +2448 @@
         uint8_t const *pbEntry  = &pThis->abBuf[iEntry * ISO9660_ELTORITO_ENTRY_SIZE];
         uint8_t const  idHeader = *pbEntry;
+
+        /* KLUDGE ALERT! Older ISO images, like RHEL5-Server-20070208.0-x86_64-DVD.iso lacks
+                         terminator entry. So, quietly stop with an entry that's all zeros. */
+        if (   idHeader == ISO9660_ELTORITO_BOOT_INDICATOR_NOT_BOOTABLE /* 0x00 */
+            && iEntry != 1 /* default */
+            && ASMMemIsZero(pbEntry, ISO9660_ELTORITO_ENTRY_SIZE))
+            return rc;
+
         if (   iEntry == 1 /* default*/
             || idHeader == ISO9660_ELTORITO_BOOT_INDICATOR_BOOTABLE