From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Mon, 8 Dec 2025 13:30:05 +0000 (+0100)
Subject: Use pointer arithmetic to access window in deflate_quick/deflate_fast
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d66bdc9f8324205efc2679dec2fcff9ee59f1bf;p=thirdparty%2Fzlib-ng.git

Use pointer arithmetic to access window in deflate_quick/deflate_fast
---

diff --git a/deflate_fast.c b/deflate_fast.c
index fff137569..4040e65dc 100644
--- a/deflate_fast.c
+++ b/deflate_fast.c
@@ -45,9 +45,9 @@ Z_INTERNAL block_state deflate_fast(deflate_state *s, int flush) {
          */
         if (s->lookahead >= WANT_MIN_MATCH) {
 #if BYTE_ORDER == LITTLE_ENDIAN
-            uint32_t str_val = zng_memread_4(&window[s->strstart]);
+            uint32_t str_val = zng_memread_4(window + s->strstart);
 #else
-            uint32_t str_val = ZSWAP32(zng_memread_4(&window[s->strstart]));
+            uint32_t str_val = ZSWAP32(zng_memread_4(window + s->strstart));
 #endif
             Pos hash_head = quick_insert_value(s, s->strstart, str_val);
             int64_t dist = (int64_t)s->strstart - hash_head;
diff --git a/deflate_quick.c b/deflate_quick.c
index 372a929ef..940b93b7f 100644
--- a/deflate_quick.c
+++ b/deflate_quick.c
@@ -89,9 +89,9 @@ Z_INTERNAL block_state deflate_quick(deflate_state *s, int flush) {
 
         if (LIKELY(s->lookahead >= WANT_MIN_MATCH)) {
 #if BYTE_ORDER == LITTLE_ENDIAN
-            uint32_t str_val = zng_memread_4(&window[s->strstart]);
+            uint32_t str_val = zng_memread_4(window + s->strstart);
 #else
-            uint32_t str_val = ZSWAP32(zng_memread_4(&window[s->strstart]));
+            uint32_t str_val = ZSWAP32(zng_memread_4(window + s->strstart));
 #endif
             Pos hash_head = quick_insert_value(s, s->strstart, str_val);
             int64_t dist = (int64_t)s->strstart - hash_head;