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

Update vendor/libarchvie to git commit 860ec63

Browse Source 
Integrates my pull request #709
This commit is contained in:
Martin Matuska 2016-05-16 04:47:32 +00:00
parent cf8cc1c884
commit 8eb6639196
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpio/cpio.c
View File

@ -295,6 +295,7 @@ main(int argc, char *argv[])
"Cannot use both -p and -%c", cpio->mode); "Cannot use both -p and -%c", cpio->mode);
cpio->mode = opt; cpio->mode = opt;
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT; cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
break; break;
case OPTION_PASSPHRASE: case OPTION_PASSPHRASE:
cpio->passphrase = cpio->argument; cpio->passphrase = cpio->argument;

5
libarchive/archive_read_support_format_cpio.c
View File

@ -401,6 +401,11 @@ archive_read_format_cpio_read_header(struct archive_read *a,
/* If this is a symlink, read the link contents. */ /* If this is a symlink, read the link contents. */
if (archive_entry_filetype(entry) == AE_IFLNK) { if (archive_entry_filetype(entry) == AE_IFLNK) {
if (cpio->entry_bytes_remaining > 1024 * 1024) {
archive_set_error(&a->archive, ENOMEM,
"Rejecting malformed cpio archive: symlink contents exceed 1 megabyte");
return (ARCHIVE_FATAL);
}
h = __archive_read_ahead(a, h = __archive_read_ahead(a,
(size_t)cpio->entry_bytes_remaining, NULL); (size_t)cpio->entry_bytes_remaining, NULL);
if (h == NULL) if (h == NULL)