diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2019-02-12 23:24:45 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2019-02-12 23:24:45 +0000 |
| commit | a39fc08da229e671ae59ea0607ef4c8e44d2ceb9 (patch) | |
| tree | 5201b9de297b80a663ecdd993c614bf9b9280099 /contrib/libarchive/cpio/test | |
| parent | a6611c938b25b1fcae0b77ecbd47dbf411807196 (diff) | |
| parent | fbb1b16ad8bc7a6f9a32424ddbd61e59ad5a4d4d (diff) | |
MFV r344063:
Sync libarchive with vendor.
Relevant vendor changes:
PR #1085: Fix a null pointer dereference bug in zip writer
PR #1110: ZIP reader added support for XZ, LZMA, PPMD8 and BZIP2
decopmpression
PR #1116: Add support for 64-bit ar format
PR #1120: Fix a 7zip crash [1] and a ISO9660 infinite loop [2]
PR #1125: RAR5 reader - fix an invalid read and a memory leak
PR #1131: POSIX reader - do not fail when tree_current_lstat() fails
due to ENOENT [3]
PR #1134: Delete unnecessary null pointer checks before calls of free()
OSS-Fuzz 10843: Force intermediate to uint64_t to make UBSAN happy.
OSS-Fuzz 11011: Avoid buffer overflow in rar5 reader
PR: 233006 [3]
Security: CVE-2019-1000019 [1], CVE-2019-1000020 [2]
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=344065
Diffstat (limited to 'contrib/libarchive/cpio/test')
| -rw-r--r-- | contrib/libarchive/cpio/test/test_option_t.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libarchive/cpio/test/test_option_t.c b/contrib/libarchive/cpio/test/test_option_t.c index 6bcaee3c87ce..eaa73fa3a016 100644 --- a/contrib/libarchive/cpio/test/test_option_t.c +++ b/contrib/libarchive/cpio/test/test_option_t.c @@ -88,11 +88,11 @@ DEFINE_TEST(test_option_t) setlocale(LC_ALL, ""); #endif #if defined(_WIN32) && !defined(__CYGWIN__) - strftime(date2, sizeof(date), "%b %d %Y", localtime(&mtime)); - _snprintf(date, sizeof(date)-1, "%12s file", date2); + strftime(date2, sizeof(date2)-1, "%b %d %Y", localtime(&mtime)); + _snprintf(date, sizeof(date)-1, "%12.12s file", date2); #else - strftime(date2, sizeof(date), "%b %e %Y", localtime(&mtime)); - snprintf(date, sizeof(date)-1, "%12s file", date2); + strftime(date2, sizeof(date2)-1, "%b %e %Y", localtime(&mtime)); + snprintf(date, sizeof(date)-1, "%12.12s file", date2); #endif assertEqualMem(p + 42, date, strlen(date)); free(p); |