svn commit: r339794 - head/contrib/libarchive/libarchive
Martin Matuska
mm at FreeBSD.org
Fri Oct 26 21:17:51 UTC 2018
Author: mm
Date: Fri Oct 26 21:17:50 2018
New Revision: 339794
URL: https://svnweb.freebsd.org/changeset/base/339794
Log:
MFV r339792:
Sync libarchive with vendor.
Relevant vendor changes:
RAR5 reader: more maybe-uninitialized size_t fixes for riscv64
FreeBSD build
MFC after: 1 month
Modified:
head/contrib/libarchive/libarchive/archive_read_support_format_rar5.c
Directory Properties:
head/contrib/libarchive/ (props changed)
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_rar5.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_rar5.c Fri Oct 26 21:17:06 2018 (r339793)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_rar5.c Fri Oct 26 21:17:50 2018 (r339794)
@@ -1281,8 +1281,12 @@ static int process_head_file(struct archive_read* a, s
struct archive_entry* entry, size_t block_flags)
{
ssize_t extra_data_size = 0;
- size_t data_size, file_flags, file_attr, compression_info, host_os,
- name_size;
+ size_t data_size = 0;
+ size_t file_flags = 0;
+ size_t file_attr = 0;
+ size_t compression_info = 0;
+ size_t host_os = 0;
+ size_t name_size = 0;
uint64_t unpacked_size;
uint32_t mtime = 0, crc;
int c_method = 0, c_version = 0, is_dir;
@@ -1297,7 +1301,7 @@ static int process_head_file(struct archive_read* a, s
}
if(block_flags & HFL_EXTRA_DATA) {
- size_t edata_size;
+ size_t edata_size = 0;
if(!read_var_sized(a, &edata_size, NULL))
return ARCHIVE_EOF;
More information about the svn-src-all
mailing list