diff options
| author | mm <mm@FreeBSD.org> | 2011-12-27 10:21:29 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-12-27 10:21:29 +0000 |
| commit | 06f2b8742b7514f09b8a69b0ad0e4e0cf2b63129 (patch) | |
| tree | fb64e53a49e16c5cb36036758aed48768d0596be | |
| parent | 7c6c82edbdef7b58b0c8fce085153577d3021003 (diff) | |
| download | FreeBSD-src-06f2b8742b7514f09b8a69b0ad0e4e0cf2b63129.zip FreeBSD-src-06f2b8742b7514f09b8a69b0ad0e4e0cf2b63129.tar.gz | |
Update to vendor revision 4016
Obtained from: http://libarchive.googlecode.com/svn/release/2.8
| -rw-r--r-- | libarchive/archive_read_support_format_iso9660.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c index 2c1301a..8592744 100644 --- a/libarchive/archive_read_support_format_iso9660.c +++ b/libarchive/archive_read_support_format_iso9660.c @@ -1830,7 +1830,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent, (parent->re || parent->re_descendant)) file->re_descendant = 1; if (file->cl_offset) { - struct file_info *p; + struct file_info *r; if (parent == NULL || parent->parent == NULL) { archive_set_error(&a->archive, @@ -1858,8 +1858,8 @@ parse_file_info(struct archive_read *a, struct file_info *parent, * Sanity check: cl_offset does not point at its * the parents or itself. */ - for (p = parent; p; p = p->parent) { - if (p->offset == file->cl_offset) { + for (r = parent; r; r = r->parent) { + if (r->offset == file->cl_offset) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Invalid Rockridge CL"); |
