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
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
Index: deflate.c
|
|
===================================================================
|
|
--- deflate.c.orig
|
|
+++ deflate.c
|
|
@@ -1233,12 +1233,13 @@ local void lm_init (s)
|
|
* string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
|
|
* OUT assertion: the match length is not greater than s->lookahead.
|
|
*/
|
|
-local uInt longest_match(deflate_state *s, IPos cur_match) {
|
|
+local uInt longest_match(deflate_state *s, IPos pcur_match) {
|
|
+ ptrdiff_t cur_match = pcur_match; /* extend to pointer width */
|
|
unsigned chain_length = s->max_chain_length;/* max hash chain length */
|
|
register Bytef *scan = s->window + s->strstart; /* current string */
|
|
register Bytef *match; /* matched string */
|
|
register int len; /* length of current match */
|
|
- int best_len = (int)s->prev_length; /* best match length so far */
|
|
+ ptrdiff_t best_len = s->prev_length; /* best match length so far */
|
|
int nice_match = s->nice_match; /* stop if match long enough */
|
|
IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
|
|
s->strstart - (IPos)MAX_DIST(s) : NIL;
|
|
@@ -1256,12 +1257,12 @@ local uInt longest_match(s, cur_match)
|
|
* Try with and without -DUNALIGNED_OK to check.
|
|
*/
|
|
register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
|
|
- register ush scan_start = *(ushf*)scan;
|
|
- register ush scan_end = *(ushf*)(scan + best_len - 1);
|
|
+ register uInt scan_start = *(ushf*)scan;
|
|
+ register uInt scan_end = *(ushf*)(scan + best_len - 1);
|
|
#else
|
|
register Bytef *strend = s->window + s->strstart + MAX_MATCH;
|
|
- register Byte scan_end1 = scan[best_len - 1];
|
|
- register Byte scan_end = scan[best_len];
|
|
+ register uInt scan_end1 = scan[best_len - 1];
|
|
+ register uInt scan_end = scan[best_len];
|
|
#endif
|
|
|
|
/* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
|