Relax the bidder to accept images created by buggy FreeBSD/NetBSD

"makefs" program.

SVN-Revision: 3625

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index b537af6c941253370a4a98edf54f009c4c764648..c41619a3becf75098d4f336f39ad3590b4e521f2 100644 (file)
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -898,8 +898,10 @@ isPVD(struct iso9660 *iso9660, const unsigned char *h)
                return (0);
 
        /* Reserved field must be 0. */
+       /* But accept NetBSD/FreeBSD "makefs" images with 0x20 here. */
        for (i = 0; i < PVD_reserved4_size; ++i)
-               if (h[PVD_reserved4_offset + i] != 0)
+               if (h[PVD_reserved4_offset + i] != 0
+                   && h[PVD_reserved4_offset + i] != 0x20)
                        return (0);
 
        /* Reserved field must be 0. */