From: Nathan Moinvaziri <nathan@solidstatenetworks.com>
Date: Sun, 20 Oct 2019 21:40:42 +0000 (-0700)
Subject: Fixed load of misaligned address in deflate_quick.c. zlib-ng/zlib-ng#453
X-Git-Tag: 1.9.9-b1~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30131c54a9f62cdf8a93162b63216ca2cc516b8c;p=thirdparty%2Fzlib-ng.git

Fixed load of misaligned address in deflate_quick.c. zlib-ng/zlib-ng#453
---

diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c
index b60fc04f..3fa4f187 100644
--- a/arch/x86/deflate_quick.c
+++ b/arch/x86/deflate_quick.c
@@ -62,7 +62,7 @@ static inline long compare258(const unsigned char *const src0, const unsigned ch
         cnt += 16;
     } while (cnt < 256);
 
-    if (*(unsigned short *)(src0 + cnt) == *(unsigned short *)(src1 + cnt)) {
+    if (memcmp(src0 + cnt, src1 + cnt, sizeof(uint16_t)) == 0) {
         cnt += 2;
     } else if (*(src0 + cnt) == *(src1 + cnt)) {
         cnt++;