de997e08c9
- Update to 1.13: * Fix configure issue that discarded provided CC definition * Correct incorrect inputs provided to the CRC functions * Repair prototypes and exporting of new CRC functions * Fix inflateBack to detect invalid input with distances too far * Have infback() deliver all of the available output up to any error * Fix a bug when getting a gzip header extra field with inflate() * Fix bug in block type selection when Z_FIXED used * Tighten deflateBound bounds * Remove deleted assembler code references * Various portability and appearance improvements - Added patches: * zlib-1.2.13-IBM-Z-hw-accelerated-deflate-s390x.patch * zlib-1.2.13-fix-bug-deflateBound.patch * zlib-1.2.13-optimized-s390.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-s390-vectorize-crc32.patch - Removed patches: * zlib-1.2.12-fix-configure.patch * zlib-1.2.12-IBM-Z-hw-accelerated-deflate-s390x.patch * zlib-1.2.12-optimized-crc32-power8.patch * zlib-1.2.12-correct-inputs-provided-to-crc-func.patch * zlib-1.2.12-fix-CVE-2022-37434.patch * zlib-1.2.11-optimized-s390.patch OBS-URL: https://build.opensuse.org/request/show/1059548 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=86
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
Index: deflate.c
|
|
===================================================================
|
|
--- deflate.c.orig
|
|
+++ deflate.c
|
|
@@ -1233,15 +1233,16 @@ 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(s, cur_match)
|
|
+local uInt longest_match(s, pcur_match)
|
|
deflate_state *s;
|
|
- IPos cur_match; /* current match */
|
|
+ IPos pcur_match; /* current 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.
|