diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2016-08-14 09:26:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2016-08-14 09:26:10 +0000 |
| commit | cfa49a9b0bbcb42830145d11f7b7e3f22804ecd2 (patch) | |
| tree | 1a5d2774f7e5684616e07147ae0f78915b0ae2a6 /contrib/libarchive/cpio/test | |
| parent | ed1202fc8077dc38e3f52c6506938c44beaba98a (diff) | |
| parent | 5b0ba629933ba7fd02398bcd8600d27a17fdf9b0 (diff) | |
MFV r304060:
Sync libarchive with vendor including three security fixes
Vendor issues fixed:
Issue #744: Very long pathnames evade symlink checks
Issue #748: libarchive can compress, but cannot decompress zip some files
PR #750: ustar: fix out of bounds read on empty string ("") filename
PR #755: fix use of acl_get_flagset_np() on FreeBSD
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=304075
Diffstat (limited to 'contrib/libarchive/cpio/test')
| -rw-r--r-- | contrib/libarchive/cpio/test/test_option_version.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libarchive/cpio/test/test_option_version.c b/contrib/libarchive/cpio/test/test_option_version.c index 32ba3000477e..ac58cefda11f 100644 --- a/contrib/libarchive/cpio/test/test_option_version.c +++ b/contrib/libarchive/cpio/test/test_option_version.c @@ -75,7 +75,7 @@ verify(const char *p, size_t s) if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd') ++q; /* Skip arbitrary third-party version numbers. */ - while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) { + while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) { ++q; --s; } |