diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-01-29 22:20:28 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-01-29 22:20:28 +0000 |
| commit | e60867e9535054ab800c0324ad56f8870a0b7fbd (patch) | |
| tree | acc8ff743ececc0f7da3f38aff9daf092a48b4a9 /contrib | |
| parent | 8d2393a033db19750854436a6403f97615f4d4ec (diff) | |
| parent | d8b2811c01ad218932b237af23558ab000e58265 (diff) | |
| download | src-e60867e9535054ab800c0324ad56f8870a0b7fbd.tar.gz src-e60867e9535054ab800c0324ad56f8870a0b7fbd.zip | |
Uupdate code to vendor rev. 4183 (release/2.8)
Fixes vendor issue 224:
"Mishandling CD9660 images with RockRidge extensions from FreeBSD makefs"
References:
http://code.google.com/p/libarchive/issues/detail?id=224
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=230759
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read_support_format_iso9660.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c b/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c index 5c5addbbc691..d74554b1a321 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c @@ -1778,6 +1778,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. */ |