From: Yann Collet <yann.collet.73@gmail.com>
Date: Tue, 3 Nov 2015 09:48:42 +0000 (+0100)
Subject: Fixed asan issue reported by Maciej Adamczyk
X-Git-Tag: zstd-0.3.3^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=588d1e5fa035a5aad0f3ebf2e594ba3c6798e98e;p=thirdparty%2Fzstd.git

Fixed asan issue reported by Maciej Adamczyk
---

diff --git a/lib/zstd.c b/lib/zstd.c
index c79994456..c7dcc262a 100644
--- a/lib/zstd.c
+++ b/lib/zstd.c
@@ -570,7 +570,7 @@ static size_t ZSTD_compressBlock(ZSTD_CCtx* ctx, void* dst, size_t maxDstSize, c
     ZSTD_resetSeqStore(seqStorePtr);
 
     /* Main Search Loop */
-    while (ip <= ilimit)
+    while (ip < ilimit)  /* < instead of <=, because unconditionnal ZSTD_addPtr(ip+1) */
     {
         const BYTE* match = ZSTD_updateMatch(HashTable, ip, base);
 
@@ -591,7 +591,8 @@ static size_t ZSTD_compressBlock(ZSTD_CCtx* ctx, void* dst, size_t maxDstSize, c
             ZSTD_addPtr(HashTable, ip+1, base);
             ip += matchLength + MINMATCH;
             anchor = ip;
-            if (ip <= ilimit) ZSTD_addPtr(HashTable, ip-2, base);
+            if (ip < ilimit) /* same test as loop, for speed */
+                ZSTD_addPtr(HashTable, ip-2, base);
         }
     }