pool/zlib
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1085025 from home:dspinella:branches:devel:libraries:c_c++

Browse Source 
- Fix deflateBound() before deflateInit(), bsc#1210593, bsc#1211005
  bsc1210593.patch

OBS-URL: https://build.opensuse.org/request/show/1085025
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=93
This commit is contained in:
Danilo Spinella 2023-05-05 10:01:14 +00:00 committed by Git OBS Bridge
parent 71481c0267
commit e6f111ebe2
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bsc1210593.patch Normal file
View File

@ -0,0 +1,13 @@
Index: zlib-1.2.11/contrib/s390/dfltcc_deflate.h
===================================================================
--- zlib-1.2.11.orig/contrib/s390/dfltcc_deflate.h
+++ zlib-1.2.11/contrib/s390/dfltcc_deflate.h
@@ -45,7 +45,7 @@ int ZLIB_INTERNAL dfltcc_deflate_get_dic
#define DEFLATE_DONE dfltcc_deflate_done
#define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, source_len) \
do { \
- if (dfltcc_can_deflate((strm))) \
+ if (deflateStateCheck((strm)) || dfltcc_can_deflate((strm))) \
(complen) = DEFLATE_BOUND_COMPLEN(source_len); \
} while (0)
#define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) (dfltcc_can_deflate((strm)))

6
zlib.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 5 09:56:31 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
- Fix deflateBound() before deflateInit(), bsc#1210593, bsc#1211005
bsc1210593.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 1 17:50:05 UTC 2023 - Dirk Müller <dmueller@suse.com> Wed Mar 1 17:50:05 UTC 2023 - Dirk Müller <dmueller@suse.com>

4
zlib.spec
View File

@ -53,6 +53,9 @@ Patch15: zlib-1.2.12-adler32-vector-optimizations-for-power.patch
Patch16: zlib-1.2.12-fix-invalid-memory-access-on-ppc-and-ppc64.patch Patch16: zlib-1.2.12-fix-invalid-memory-access-on-ppc-and-ppc64.patch
Patch17: zlib-1.2.12-add-optimized-slide_hash-for-power.patch Patch17: zlib-1.2.12-add-optimized-slide_hash-for-power.patch
Patch18: zlib-1.2.12-add-vectorized-longest_match-for-power.patch Patch18: zlib-1.2.12-add-vectorized-longest_match-for-power.patch
# PATCH-FIX-UPSTREAM danilo.spinella@suse.com bsc#1210593 bsc#1211005
# Fix deflateBound() before deflateInit()
Patch19: bsc1210593.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
@ -155,6 +158,7 @@ It should exit 0
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1
cp %{SOURCE4} . cp %{SOURCE4} .
%build %build