Rebased to version 3.5.2

Resolves: #1996634
This commit is contained in:
Ondrej Dubaj 2021-08-23 14:18:06 +02:00
parent b2a59114ca
commit 00169c4351
3 changed files with 6 additions and 42 deletions

View File

@ -1,38 +0,0 @@
From 2722f5afe48a9a4089d41f75ec65d090934cfa52 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Tue, 11 May 2021 07:39:57 +0200
Subject: [PATCH] - Fixed double free when calling lzx_huffman_init frees
pointer ds - Fixed leak of rar before ending with error
---
libarchive/archive_read_support_format_cab.c | 1 -
libarchive/archive_read_support_format_rar5.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c
index 43738b5..950f3d2 100644
--- a/libarchive/archive_read_support_format_cab.c
+++ b/libarchive/archive_read_support_format_cab.c
@@ -2110,7 +2110,6 @@ lzx_decode_init(struct lzx_stream *strm, int w_bits)
ds->pos_tbl = malloc(sizeof(ds->pos_tbl[0]) * w_slot);
if (ds->pos_tbl == NULL)
return (ARCHIVE_FATAL);
- lzx_huffman_free(&(ds->mt));
}
for (footer = 0; footer < 18; footer++)
diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c
index 58a61d1..5d62d16 100644
--- a/libarchive/archive_read_support_format_rar5.c
+++ b/libarchive/archive_read_support_format_rar5.c
@@ -4076,6 +4076,7 @@ int archive_read_support_format_rar5(struct archive *_a) {
if(ARCHIVE_OK != rar5_init(rar)) {
archive_set_error(&ar->archive, ENOMEM,
"Can't allocate rar5 filter buffer");
+ free(rar);
return ARCHIVE_FATAL;
}
--
2.30.2

View File

@ -1,15 +1,14 @@
%bcond_without check
Name: libarchive
Version: 3.5.1
Release: 7%{?dist}
Version: 3.5.2
Release: 1%{?dist}
Summary: A library for handling streaming archive formats
License: BSD
URL: https://www.libarchive.org/
Source0: https://libarchive.org/downloads/%{name}-%{version}.tar.gz
Patch0: libarchive-3.5.1-fix-covscan-rhel-9.patch
Patch1: openssl3-rmd160failure.patch
BuildRequires: automake
@ -214,6 +213,9 @@ run_testsuite
%changelog
* Mon Aug 23 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.5.2-1
- Rebased to version 3.5.2 (#1996634)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.5.1-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (libarchive-3.5.1.tar.gz) = 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
SHA512 (libarchive-3.5.2.tar.gz) = 2003ec9b24086373451bd7317bdab86d81627f087c14a6f7df1a92e131a216749f9aa352504c3d04dc82b62078b59aeea5aad5543b7e6c1c21fcafa2955d3762