From d8b2811c01ad218932b237af23558ab000e58265 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Sun, 29 Jan 2012 22:12:48 +0000 Subject: [PATCH] Update to vendor revision 4183 Obtained from: http://libarchive.googlecode.com/svn/release/2.8 --- libarchive/archive_read_support_format_iso9660.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c index 85927444c187..52944e0ae40b 100644 --- a/libarchive/archive_read_support_format_iso9660.c +++ b/libarchive/archive_read_support_format_iso9660.c @@ -1775,6 +1775,19 @@ parse_file_info(struct archive_read *a, struct file_info *parent, free(file); return (NULL); } + /* + * A file size of symbolic link files in ISO images + * made by makefs is not zero and its location is + * the same as those of next regular file. That is + * the same as hard like file and it causes unexpected + * error. + */ + if (file->size > 0 && + (file->mode & AE_IFMT) == AE_IFLNK) { + file->size = 0; + file->number = -1; + file->offset = -1; + } } else /* If there isn't SUSP, disable parsing * rock ridge extensions. */