Date: Fri, 28 Jul 2017 23:51:08 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r321673 - vendor/libarchive/dist/libarchive Message-ID: <201707282351.v6SNp8o8040824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Fri Jul 28 23:51:08 2017 New Revision: 321673 URL: https://svnweb.freebsd.org/changeset/base/321673 Log: Update vendor/libarchive to git de20494ba2a4fcff8b56010faa75467ad8d5a40b Relevant vendor changes: PR #926: ensure ar strtab is null terminated Modified: vendor/libarchive/dist/libarchive/archive_cryptor_private.h vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c Modified: vendor/libarchive/dist/libarchive/archive_cryptor_private.h ============================================================================== --- vendor/libarchive/dist/libarchive/archive_cryptor_private.h Fri Jul 28 23:48:51 2017 (r321672) +++ vendor/libarchive/dist/libarchive/archive_cryptor_private.h Fri Jul 28 23:51:08 2017 (r321673) @@ -64,7 +64,7 @@ typedef struct { } archive_crypto_ctx; #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) -#include <Bcrypt.h> +#include <bcrypt.h> /* Common in other bcrypt implementations, but missing from VS2008. */ #ifndef BCRYPT_SUCCESS Modified: vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c ============================================================================== --- vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c Fri Jul 28 23:48:51 2017 (r321672) +++ vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c Fri Jul 28 23:51:08 2017 (r321673) @@ -374,13 +374,14 @@ archive_write_ar_data(struct archive_write *a, const v return (ARCHIVE_WARN); } - ar->strtab = (char *)malloc(s); + ar->strtab = (char *)malloc(s + 1); if (ar->strtab == NULL) { archive_set_error(&a->archive, ENOMEM, "Can't allocate strtab buffer"); return (ARCHIVE_FATAL); } - strncpy(ar->strtab, buff, s); + memcpy(ar->strtab, buff, s); + ar->strtab[s] = '\0'; ar->has_strtab = 1; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707282351.v6SNp8o8040824>