From: W. Felix Handte Date: Wed, 20 Jun 2018 20:54:53 +0000 (-0400) Subject: Consistency in Guarding DMS-Only Variable Initializations X-Git-Tag: v1.3.5~3^2~10^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d81f71e8390ddce11e186854d407f5d9bfc7805;p=thirdparty%2Fzstd.git Consistency in Guarding DMS-Only Variable Initializations --- diff --git a/lib/compress/zstd_opt.c b/lib/compress/zstd_opt.c index 90a262025..3a6e4c45d 100644 --- a/lib/compress/zstd_opt.c +++ b/lib/compress/zstd_opt.c @@ -526,7 +526,7 @@ U32 ZSTD_insertBtAndGetAllMatches ( U32 mnum = 0; U32 nbCompares = 1U << cParams->searchLog; - const ZSTD_matchState_t* dms = ms->dictMatchState; + const ZSTD_matchState_t* dms = dictMode == ZSTD_dictMatchState ? ms->dictMatchState : NULL; const BYTE* const dmsBase = dictMode == ZSTD_dictMatchState ? dms->window.base : NULL; const BYTE* const dmsEnd = dictMode == ZSTD_dictMatchState ? dms->window.nextSrc : NULL; U32 const dmsHighLimit = dictMode == ZSTD_dictMatchState ? (U32)(dmsEnd - dmsBase) : 0;