diff options
author | Tim Kientzle <kientzle@FreeBSD.org> | 2009-01-13 04:56:41 +0000 |
---|---|---|
committer | Tim Kientzle <kientzle@FreeBSD.org> | 2009-01-13 04:56:41 +0000 |
commit | 3342e454028e2aec8018d6372b04b195d33d88a0 (patch) | |
tree | d9191a7dc07c966c6eb4b6878de13b863874b14d /lib/libarchive/archive_read_support_format_iso9660.c | |
parent | 6df8576005cb6b090a3662eaf9ade73a6fa414ee (diff) | |
download | src-3342e454028e2aec8018d6372b04b195d33d88a0.tar.gz src-3342e454028e2aec8018d6372b04b195d33d88a0.zip |
"The first part is just to give more info, the latter part fixes
an error to read files past the 32bit byte offset, for instance
on DVDs."
Submitted by: phk@
MFC after: 10 days
Notes
Notes:
svn path=/head/; revision=187126
Diffstat (limited to 'lib/libarchive/archive_read_support_format_iso9660.c')
-rw-r--r-- | lib/libarchive/archive_read_support_format_iso9660.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/libarchive/archive_read_support_format_iso9660.c b/lib/libarchive/archive_read_support_format_iso9660.c index e64b6fc2b4aa..ab96a27e99a1 100644 --- a/lib/libarchive/archive_read_support_format_iso9660.c +++ b/lib/libarchive/archive_read_support_format_iso9660.c @@ -466,7 +466,10 @@ archive_read_format_iso9660_read_header(struct archive_read *a, * seek backwards to extract it, so issue a warning. */ if (file->offset < iso9660->current_position) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Ignoring out-of-order file"); + "Ignoring out-of-order file @%x (%s) %jd < %jd", + file, + iso9660->pathname.s, + file->offset, iso9660->current_position); iso9660->entry_bytes_remaining = 0; iso9660->entry_sparse_offset = 0; release_file(iso9660, file); @@ -607,7 +610,7 @@ parse_file_info(struct iso9660 *iso9660, struct file_info *parent, file->parent = parent; if (parent != NULL) parent->refcount++; - file->offset = toi(isodirrec + DR_extent_offset, DR_extent_size) + file->offset = (uint64_t)toi(isodirrec + DR_extent_offset, DR_extent_size) * iso9660->logical_block_size; file->size = toi(isodirrec + DR_size_offset, DR_size_size); file->mtime = isodate7(isodirrec + DR_date_offset); |