diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2016-12-17 02:07:08 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2016-12-17 02:07:08 +0000 |
| commit | 6a414569b3517371c5c628abc9e02d87493e9678 (patch) | |
| tree | 7eb462fb838a47e308bb454a799c5c7c1b8e15fd /contrib/libarchive/cpio/test | |
| parent | 71057cd207d024c194e28594eb2fa5b9d9485fff (diff) | |
| parent | fb179c62da3d1cc4313f6f8f8e53b2e319999dd3 (diff) | |
MFV r310115,310184:
Sync libarchive with vendor.
Vendor bugfixes (relevant to FreeBSD):
PR 830, 831, 833: Spelling fixes
OSS-Fuzz 227, 230, 239: Fix possible memory leak in archive_read_free()
OSS-Fuzz 237: Fix heap buffer overflow when reading invalid ar archives
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=310185
Diffstat (limited to 'contrib/libarchive/cpio/test')
| -rw-r--r-- | contrib/libarchive/cpio/test/test_option_lz4.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/libarchive/cpio/test/test_option_lz4.c b/contrib/libarchive/cpio/test/test_option_lz4.c index d430ac755f4f..afd683ddc773 100644 --- a/contrib/libarchive/cpio/test/test_option_lz4.c +++ b/contrib/libarchive/cpio/test/test_option_lz4.c @@ -63,6 +63,13 @@ DEFINE_TEST(test_option_lz4) "but no such program is available on this system."); return; } + /* On some systems the error won't be detected until closing + time, by a 127 exit error returned by waitpid. */ + if (strstr(p, "Error closing") != NULL && !canLz4()) { + skipping("This version of bsdcpio uses an external lz4 program " + "but no such program is available on this system."); + return; + } failure("--lz4 option is broken: %s", p); assertEqualInt(r, 0); return; |