1 |
jpp |
1.1 |
Index: libarchive/archive_read_support_format_iso9660.c |
2 |
|
|
=================================================================== |
3 |
|
|
--- libarchive/archive_read_support_format_iso9660.c (revision 1983) |
4 |
|
|
+++ libarchive/archive_read_support_format_iso9660.c (revision 1984) |
5 |
|
|
@@ -924,7 +924,7 @@ |
6 |
|
|
if (parent->offset + parent->size > iso9660->volume_size) { |
7 |
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, |
8 |
|
|
"Directory is beyond end-of-media: %s", |
9 |
|
|
- parent->name); |
10 |
|
|
+ parent->name.s); |
11 |
|
|
return (ARCHIVE_WARN); |
12 |
|
|
} |
13 |
|
|
if (iso9660->current_position < parent->offset) { |
14 |
|
|
@@ -1220,7 +1220,7 @@ |
15 |
|
|
|
16 |
|
|
if (file->offset + file->size > iso9660->volume_size) { |
17 |
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, |
18 |
|
|
- "File is beyond end-of-media: %s", file->name); |
19 |
|
|
+ "File is beyond end-of-media: %s", file->name.s); |
20 |
|
|
iso9660->entry_bytes_remaining = 0; |
21 |
|
|
iso9660->entry_sparse_offset = 0; |
22 |
|
|
return (ARCHIVE_WARN); |
23 |
|
|
@@ -1279,8 +1279,8 @@ |
24 |
|
|
if ((file->mode & AE_IFMT) != AE_IFDIR && |
25 |
|
|
file->offset < iso9660->current_position) { |
26 |
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, |
27 |
|
|
- "Ignoring out-of-order file @%x (%s) %jd < %jd", |
28 |
|
|
- file, |
29 |
|
|
+ "Ignoring out-of-order file @%jx (%s) %jd < %jd", |
30 |
|
|
+ (intmax_t)file->number, |
31 |
|
|
iso9660->pathname.s, |
32 |
|
|
file->offset, iso9660->current_position); |
33 |
|
|
iso9660->entry_bytes_remaining = 0; |