nabijaczleweli
commented
3 months ago behold, my amazing debugging methodology:
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 25ab11b..93f0ad6 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -527,10 +527,10 @@ archive_read_format_iso9660_bid(struct archive_read *a, int best_bid)
bytes_read -= LOGICAL_BLOCK_SIZE, p += LOGICAL_BLOCK_SIZE) {
/* Do not handle undefined Volume Descriptor Type. */
if (p[0] >= 4 && p[0] <= 254)
- return (0);
+ {fprintf(stderr, "return 0: 1\n"); return (0);}
/* Standard Identifier must be "CD001" */
if (memcmp(p + 1, "CD001", 5) != 0)
- return (0);
+ {fprintf(stderr, "return 0: 2\n"); return (0);}
if (isPVD(iso9660, p))
continue;
if (!iso9660->joliet.location) {
@@ -549,7 +549,7 @@ archive_read_format_iso9660_bid(struct archive_read *a, int best_bid)
seenTerminator = 1;
break;
}
- return (0);
+ {fprintf(stderr, "return 0: 3\n"); return (0);}
}
/*
* ISO 9660 format must have Primary Volume Descriptor andand further
static int
isVDSetTerminator(struct iso9660 *iso9660, const unsigned char *h)
{
(void)iso9660; /* UNUSED */
/* Type of the Volume Descriptor Set Terminator must be 255. */
if (h[0] != 255)
{fprintf(stderr, "isVDSetTerminator 1: %o\n", h[0]); return (0);}
/* Volume Descriptor Version must be 1. */
if (h[6] != 1)
{fprintf(stderr, "isVDSetTerminator 2\n"); return (0);}
return (1);
}the CSRG ISO hits return 0: 3 due to isVDSetTerminator 1: 1, so this is a PVD but doesn't get caught by isPVD.
This appears to be because isPVD: (p[DR_length_offset] != 34) = 1, and indeed this is 68, so the root directory is twice as large as you're allowing it to be?
kientzle
M-a-r-k
bsdtar -tfon https://archive.org/details/The_CSRG_Archives_CD-ROM_1_August_1998_Marshall_Kirk_McKusick (and 2, 3, and 4) simply returns empty, with a strace ofThis happens on 3.6.2-1, 3.7.2-2.1, and trunk (6ee1eebefdf41f36ef1a548c9a7000d132c453f3).
Other ISOs do work. This is distinct from #954 (i.e. I applied that diff and it still happens).