From: Tim Kientzle <kientzle@gmail.com>
Date: Tue, 16 Aug 2011 06:01:47 +0000 (-0400)
Subject: Relax the bidder to accept images created by buggy FreeBSD/NetBSD
X-Git-Tag: v3.0.0a~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073d586ca07892d29547036aa8fb6f925b76f352;p=thirdparty%2Flibarchive.git

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 b537af6c9..c41619a3b 100644
--- 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. */