d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uupdate code to vendor rev. 4183 (release/2.8)

Browse Source 
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
This commit is contained in:
Martin Matuska 2012-01-29 22:20:28 +00:00
commit e60867e953
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
View File

@ -1778,6 +1778,19 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
free(file); free(file);
return (NULL); 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 } else
/* If there isn't SUSP, disable parsing /* If there isn't SUSP, disable parsing
* rock ridge extensions. */ * rock ridge extensions. */