22d97a578b
- Update to 1.3: * Building using K&R (pre-ANSI) function definitions is no longer supported. * Fixed a bug in deflateBound() for level 0 and memLevel 9. * Fixed a bug when gzungetc() is used immediately after gzopen(). * Fixed a bug when using gzflush() with a very small buffer. * Fixed a crash when gzsetparams() is attempted for a transparent write. * Fixed test/example.c to work with FORCE_STORED. * Fixed minizip to allow it to open an empty zip file. * Fixed reading disk number start on zip64 files in minizip. * Fixed a logic error in minizip argument processing. - Added patches: * zlib-1.3-IBM-Z-hw-accelerated-deflate-s390x.patch - Refreshed patches: * zlib-1.2.12-add-optimized-slide_hash-for-power.patch * zlib-1.2.12-add-vectorized-longest_match-for-power.patch * zlib-1.2.12-adler32-vector-optimizations-for-power.patch * zlib-1.2.13-optimized-s390.patch * zlib-format.patch * zlib-no-version-check.patch - Removed patches: * bsc1210593.patch * zlib-1.2.13-fix-bug-deflateBound.patch * zlib-1.2.12-s390-vectorize-crc32.patch * zlib-1.2.13-IBM-Z-hw-accelerated-deflate-s390x.patch * zlib-1.2.12-add-optimized-slide_hash-for-power.patch * zlib-1.2.12-fix-invalid-memory-access-on-ppc-and-ppc64.patch * zlib-1.2.12-add-vectorized-longest_match-for-power.patch * zlib-1.2.12-adler32-vector-optimizations-for-power.patch - Fix CVE-2023-45853, integer overflow and resultant heap-based buffer overflow in zipOpenNewFileInZip4_6, bsc#1216378 OBS-URL: https://build.opensuse.org/request/show/1119078 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=95
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
Index: zlib-1.3/infback.c
|
|
===================================================================
|
|
--- zlib-1.3.orig/infback.c
|
|
+++ zlib-1.3/infback.c
|
|
@@ -27,9 +27,6 @@ int ZEXPORT inflateBackInit_(z_streamp s
|
|
int stream_size) {
|
|
struct inflate_state FAR *state;
|
|
|
|
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
|
|
- stream_size != (int)(sizeof(z_stream)))
|
|
- return Z_VERSION_ERROR;
|
|
if (strm == Z_NULL || window == Z_NULL ||
|
|
windowBits < 8 || windowBits > 15)
|
|
return Z_STREAM_ERROR;
|
|
Index: zlib-1.3/inflate.c
|
|
===================================================================
|
|
--- zlib-1.3.orig/inflate.c
|
|
+++ zlib-1.3/inflate.c
|
|
@@ -180,9 +180,6 @@ int ZEXPORT inflateInit2_(z_streamp strm
|
|
int ret;
|
|
struct inflate_state FAR *state;
|
|
|
|
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
|
|
- stream_size != (int)(sizeof(z_stream)))
|
|
- return Z_VERSION_ERROR;
|
|
if (strm == Z_NULL) return Z_STREAM_ERROR;
|
|
strm->msg = Z_NULL; /* in case we return an error */
|
|
if (strm->zalloc == (alloc_func)0) {
|
|
Index: zlib-1.3/deflate.c
|
|
===================================================================
|
|
--- zlib-1.3.orig/deflate.c
|
|
+++ zlib-1.3/deflate.c
|
|
@@ -384,12 +384,7 @@ int ZEXPORT deflateInit2_(z_streamp strm
|
|
const char *version, int stream_size) {
|
|
deflate_state *s;
|
|
int wrap = 1;
|
|
- static const char my_version[] = ZLIB_VERSION;
|
|
|
|
- if (version == Z_NULL || version[0] != my_version[0] ||
|
|
- stream_size != sizeof(z_stream)) {
|
|
- return Z_VERSION_ERROR;
|
|
- }
|
|
if (strm == Z_NULL) return Z_STREAM_ERROR;
|
|
|
|
strm->msg = Z_NULL;
|