From: inikep Date: Sun, 31 Jul 2016 18:08:53 +0000 (+0200) Subject: fixed ZSTD_compressBlock_opt_extDict_generic X-Git-Tag: v0.8.0^2^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F267%2Fhead;p=thirdparty%2Fzstd.git fixed ZSTD_compressBlock_opt_extDict_generic --- diff --git a/lib/compress/zstd_opt.h b/lib/compress/zstd_opt.h index 9496ed358..b7970bdb7 100644 --- a/lib/compress/zstd_opt.h +++ b/lib/compress/zstd_opt.h @@ -782,7 +782,7 @@ void ZSTD_compressBlock_opt_extDict_generic(ZSTD_CCtx* ctx, const U32 repIndex = (U32)(current - rep[i]); const BYTE* const repBase = repIndex < dictLimit ? dictBase : base; const BYTE* const repMatch = repBase + repIndex; - if ((rep[i]<(U32)(ip-prefixStart)) + if ( (rep[i] <= current) && (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex>lowestIndex)) /* intentional overflow */ && (MEM_readMINMATCH(ip, minMatch) == MEM_readMINMATCH(repMatch, minMatch)) ) { /* repcode detected we should take it */ @@ -885,7 +885,7 @@ void ZSTD_compressBlock_opt_extDict_generic(ZSTD_CCtx* ctx, const U32 repIndex = (U32)(current+cur - opt[cur].rep[i]); const BYTE* const repBase = repIndex < dictLimit ? dictBase : base; const BYTE* const repMatch = repBase + repIndex; - if ((opt[cur].rep[i]<(U32)(ip-prefixStart)) + if ( (opt[cur].rep[i] <= current+cur) && (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex>lowestIndex)) /* intentional overflow */ && (MEM_readMINMATCH(inr, minMatch) == MEM_readMINMATCH(repMatch, minMatch)) ) { /* repcode detected */