From: Nathan Moinvaziri <nathan@solidstatenetworks.com>
Date: Sun, 10 May 2020 03:41:18 +0000 (-0400)
Subject: Change quick_insert_string memory access to be similar to insert_string.
X-Git-Tag: 1.9.9-b1~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e3d9be44c0aefeda3973bbe85387aebe1a3c8c4;p=thirdparty%2Fzlib-ng.git

Change quick_insert_string memory access to be similar to insert_string.
---

diff --git a/insert_string_tpl.h b/insert_string_tpl.h
index 9de7d5d66..eee01070e 100644
--- a/insert_string_tpl.h
+++ b/insert_string_tpl.h
@@ -29,15 +29,16 @@
  */
 ZLIB_INTERNAL Pos QUICK_INSERT_STRING(deflate_state *const s, const Pos str) {
     Pos head;
+    uint8_t *strstart = s->window + str;
     uint32_t val, hm, h = 0;
 
 #ifdef UNALIGNED_OK
-    val = *(uint32_t *)(s->window + str);
+    val = *(uint32_t *)(strstart);
 #else
-    val  = ((uint32_t)s->window[str]);
-    val |= ((uint32_t)s->window[str+1] << 8);
-    val |= ((uint32_t)s->window[str+2] << 16);
-    val |= ((uint32_t)s->window[str+3] << 24);
+    val  = ((uint32_t)(strstart[0]));
+    val |= ((uint32_t)(strstart[1]) << 8);
+    val |= ((uint32_t)(strstart[2]) << 16);
+    val |= ((uint32_t)(strstart[3]) << 24);
 #endif
 
     UPDATE_HASH(s, h, val);