From: Allan Jude <allan@klarasystems.com>
Date: Thu, 3 Sep 2020 19:31:50 +0000 (+0000)
Subject: Resolve Coverity 1432392 Unintentional integer overflow
X-Git-Tag: v1.4.7~86^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2293%2Fhead;p=thirdparty%2Fzstd.git

Resolve Coverity 1432392 Unintentional integer overflow

Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN)
overflow_before_widen: Potentially overflowing expression:
cdict->dictContentSize * 6U
with type unsigned int (32 bits, unsigned) is evaluated using 32-bit
arithmetic, and then used in a context that expects an expression of
type U64 (64 bits, unsigned).
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 3f963b1cf..68abb736a 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -3074,7 +3074,7 @@ ZSTD_compress_insertDictionary(ZSTD_compressedBlockState_t* bs,
 }
 
 #define ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF (128 KB)
-#define ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER (6)
+#define ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER (6ULL)
 
 /*! ZSTD_compressBegin_internal() :
  * @return : 0, or an error code */