diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-04-29 08:15:04 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-04-29 08:17:53 +0000 |
| commit | 13d826ff947d9026f98e317e7385b22abfc0eace (patch) | |
| tree | cf3cb413613c7a21e21c6d734e87c2653816d5ed /contrib/libarchive/libarchive/archive_util.c | |
| parent | d289382897e7ded566a3aa10ae535235149c4056 (diff) | |
| parent | 51c823ac2777784a4eac71d113e8c82c08482bb6 (diff) | |
| download | src-13d826ff947d9026f98e317e7385b22abfc0eace.tar.gz src-13d826ff947d9026f98e317e7385b22abfc0eace.zip | |
libarchive: merge from vendor branch
Libarchive 3.7.4 + three fixes from master
Security fixes:
#2135 rar: Fix OOB in rar e8 filter (CVE-2024-26256)
#2145 zip: Fix out of boundary access
#2148 rar: Fix OOB in rar delta filter
#2149 rar: Fix OOB in rar audio filter
Important bugfixes:
#2131 7zip: Limit amount of properties
#2110 bsdtar: Fix error handling around strtol() usages
#2116 passphrase: Never allow empty passwords
#2124 rar: Fix "File CRC Error" when extracting specific rar4 archives
#2123 xar: Avoid infinite link loop
#2150 xar: Fix another infinite loop and expat error handling
#2108 zip: Update AppleDouble support for directories
#2071 zstd: Implement core detectiongit
PR: 278588 (exp-run)
MFC after: 1 day
Diffstat (limited to 'contrib/libarchive/libarchive/archive_util.c')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/libarchive/libarchive/archive_util.c b/contrib/libarchive/libarchive/archive_util.c index 32d4bd40988c..7b918fef04b8 100644 --- a/contrib/libarchive/libarchive/archive_util.c +++ b/contrib/libarchive/libarchive/archive_util.c @@ -255,10 +255,9 @@ __archive_mktempx(const char *tmpdir, wchar_t *template) #endif fd = -1; ws = NULL; + archive_string_init(&temp_name); if (template == NULL) { - archive_string_init(&temp_name); - /* Get a temporary directory. */ if (tmpdir == NULL) { size_t l; |