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/test_utils | |
| parent | a6611c938b25b1fcae0b77ecbd47dbf411807196 (diff) | |
| parent | fbb1b16ad8bc7a6f9a32424ddbd61e59ad5a4d4d (diff) | |
| download | src-a39fc08da229e671ae59ea0607ef4c8e44d2ceb9.tar.gz src-a39fc08da229e671ae59ea0607ef4c8e44d2ceb9.zip | |
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/test_utils')
| -rw-r--r-- | contrib/libarchive/test_utils/test_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/libarchive/test_utils/test_main.c b/contrib/libarchive/test_utils/test_main.c index bb71217b232c..defdd34446c4 100644 --- a/contrib/libarchive/test_utils/test_main.c +++ b/contrib/libarchive/test_utils/test_main.c @@ -2590,10 +2590,8 @@ sunacl_get(int cmd, int *aclcnt, int fd, const char *path) cnt = facl(fd, cmd, cnt, aclp); } } else { - if (aclp != NULL) { - free(aclp); - aclp = NULL; - } + free(aclp); + aclp = NULL; break; } } |