diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2018-10-26 21:17:50 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2018-10-26 21:17:50 +0000 |
| commit | b160a8765dacaf9af8754bf6248cba2132096f70 (patch) | |
| tree | ac2070f0a7b0d3428d98b09bc51d2a6d730d6cbe /contrib/libarchive | |
| parent | 15e594351afcf329b44e6cd32f702f168a3ca8d5 (diff) | |
| parent | a26007e8d35293595dadaee72d00911741d111ed (diff) | |
| download | src-b160a8765dacaf9af8754bf6248cba2132096f70.tar.gz src-b160a8765dacaf9af8754bf6248cba2132096f70.zip | |
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
Notes
Notes:
svn path=/head/; revision=339794
Diffstat (limited to 'contrib/libarchive')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read_support_format_rar5.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/libarchive/libarchive/archive_read_support_format_rar5.c b/contrib/libarchive/libarchive/archive_read_support_format_rar5.c index 3244e6d16c05..a4479f5a4a7b 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_rar5.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_rar5.c @@ -1281,8 +1281,12 @@ static int process_head_file(struct archive_read* a, struct rar5* rar, 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, struct rar5* rar, } 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; |