diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2017-10-01 00:40:23 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2017-10-01 00:40:23 +0000 |
| commit | 5c831a5bd61576cacb48b39f8eeb47b92707a355 (patch) | |
| tree | 315046b4d3237811245bd68cfa0099291b843129 /contrib/libarchive/cpio/cpio.c | |
| parent | 0ffc7ed7e310f5810af6c04137678d0bef00f2f0 (diff) | |
| parent | 533ab3c53efbfd230b718ed77dc9ea4d1446ddfc (diff) | |
| download | src-5c831a5bd61576cacb48b39f8eeb47b92707a355.tar.gz src-5c831a5bd61576cacb48b39f8eeb47b92707a355.zip | |
MFV r324145,324147:
Sync libarchive with vendor.
Relevant vendor changes:
PR #905: Support for Zstandard read and write filters
PR #922: Avoid overflow when reading corrupt cpio archive
Issue #935: heap-based buffer overflow in xml_data (CVE-2017-14166)
OSS-Fuzz 2936: Place a limit on the mtree line length
OSS-Fuzz 2394: Ensure that the ZIP AES extension header is large enough
OSS-Fuzz 573: Read off-by-one error in RAR archives (CVE-2017-14502)
MFC after: 1 week
Security: CVE-2017-14166, CVE-2017-14502
Notes
Notes:
svn path=/head/; revision=324148
Diffstat (limited to 'contrib/libarchive/cpio/cpio.c')
| -rw-r--r-- | contrib/libarchive/cpio/cpio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/libarchive/cpio/cpio.c b/contrib/libarchive/cpio/cpio.c index cade829571bb..8396f1f98ce1 100644 --- a/contrib/libarchive/cpio/cpio.c +++ b/contrib/libarchive/cpio/cpio.c @@ -269,6 +269,7 @@ main(int argc, char *argv[]) case OPTION_LZ4: case OPTION_LZMA: /* GNU tar, others */ case OPTION_LZOP: /* GNU tar, others */ + case OPTION_ZSTD: cpio->compress = opt; break; case 'm': /* POSIX 1997 */ @@ -546,6 +547,9 @@ mode_out(struct cpio *cpio) case OPTION_LZOP: r = archive_write_add_filter_lzop(cpio->archive); break; + case OPTION_ZSTD: + r = archive_write_add_filter_zstd(cpio->archive); + break; case 'j': case 'y': r = archive_write_add_filter_bzip2(cpio->archive); break; |