Check BitMask(n) n value for kBrotliBitMask[n] bounds
... until https://github.com/google/brotli/issues/1196 is clarified. Resolves: RHEL-58408
This commit is contained in:
parent
c6988765a8
commit
0f15d047e1
14
RHEL-32153-kBrotliBitMask-bounds.patch
Normal file
14
RHEL-32153-kBrotliBitMask-bounds.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- brotli-1.1.0/c/dec/bit_reader.h.RHEL-32153-kBrotliBitMask-bounds 2023-08-29 13:00:29.000000000 +0200
|
||||||
|
+++ brotli-1.1.0/c/dec/bit_reader.h 2024-09-11 13:38:21.608972528 +0200
|
||||||
|
@@ -32,8 +32,10 @@ static BROTLI_INLINE brotli_reg_t BitMas
|
||||||
|
/* Masking with this expression turns to a single
|
||||||
|
"Unsigned Bit Field Extract" UBFX instruction on ARM. */
|
||||||
|
return ~(~((brotli_reg_t)0) << n);
|
||||||
|
- } else {
|
||||||
|
+ } else if (n < 33) {
|
||||||
|
return kBrotliBitMask[n];
|
||||||
|
+ } else {
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,12 +1,13 @@
|
|||||||
Name: brotli
|
Name: brotli
|
||||||
Version: 1.1.0
|
Version: 1.1.0
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Lossless compression algorithm
|
Summary: Lossless compression algorithm
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/google/brotli
|
URL: https://github.com/google/brotli
|
||||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch1: RHEL-32153-kBrotliBitMask-bounds.patch
|
||||||
|
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
|
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
|
||||||
@ -149,6 +150,9 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 11 2024 Eike Rathke <erack@redhat.com> - 1.1.0-5
|
||||||
|
- Check BitMask(n) n value for kBrotliBitMask[n] bounds
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.0-4
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.0-4
|
||||||
- Bump release for June 2024 mass rebuild
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user