Fix the Crash in zlib deflateBound() function on s390x
Source: 113203437e..f6d382a91a
Resolves: BZ#2193044
This commit is contained in:
parent
2783e8aa9f
commit
242af50acb
@ -0,0 +1,17 @@
|
|||||||
|
--- zlib-1.2.11/contrib/s390/dfltcc_deflate.h.old 2023-05-04 09:39:23.423753908 +0000
|
||||||
|
+++ zlib-1.2.11/contrib/s390/dfltcc_deflate.h 2023-05-04 09:39:48.087753908 +0000
|
||||||
|
@@ -45,11 +45,11 @@ 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)))
|
||||||
|
#define DEFLATE_HOOK dfltcc_deflate
|
||||||
|
#define DEFLATE_NEED_CHECKSUM(strm) (!dfltcc_can_deflate((strm)))
|
||||||
|
|
||||||
|
-#endif
|
||||||
|
\ No newline at end of file
|
||||||
|
+#endif
|
@ -60,6 +60,10 @@ Patch27: zlib-1.2.11-Fix-broken-libxml2-for-python311.patch
|
|||||||
# fixed covscan issues
|
# fixed covscan issues
|
||||||
Patch28: zlib-1.2.11-covscan-issues.patch
|
Patch28: zlib-1.2.11-covscan-issues.patch
|
||||||
|
|
||||||
|
# Fix for Crash in zlib deflateBound() function on s390x
|
||||||
|
# Resolves: #2193044
|
||||||
|
Patch29: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix-crash-deflateBound.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: automake, autoconf, libtool
|
BuildRequires: automake, autoconf, libtool
|
||||||
|
|
||||||
@ -136,6 +140,7 @@ developing applications which use minizip.
|
|||||||
%patch26 -p1
|
%patch26 -p1
|
||||||
%patch27 -p1
|
%patch27 -p1
|
||||||
%patch28 -p1
|
%patch28 -p1
|
||||||
|
%patch29 -p1
|
||||||
|
|
||||||
|
|
||||||
iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp
|
iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp
|
||||||
@ -213,6 +218,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-40
|
||||||
|
- Fix the Crash in zlib deflateBound() function on s390x
|
||||||
|
- Resolves: BZ#2193044
|
||||||
|
|
||||||
* Thu Feb 09 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-39
|
* Thu Feb 09 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-39
|
||||||
- Fix covscan issue CWE-681
|
- Fix covscan issue CWE-681
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user