From: W. Felix Handte <w@felixhandte.com>
Date: Tue, 15 Sep 2020 17:57:43 +0000 (-0400)
Subject: Do More Complete CParams Deduction in Non-DDSS Path of ZSTD_createCDict_advanced2
X-Git-Tag: v1.4.7~74^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26a96a5b35deaa64c79bcf1bc39f00dee16ddfb4;p=thirdparty%2Fzstd.git

Do More Complete CParams Deduction in Non-DDSS Path of ZSTD_createCDict_advanced2

Call ZSTD_getCParamsFromCCtxParams() instead of ZSTD_getCParams_internal().
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 3e2ecdc45..08d09aa49 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -3540,8 +3540,8 @@ ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced2(const void* dict, size_t dict
         ZSTD_dedicatedDictSearch_isSupported(
             cctxParams->compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
     if (!dedicatedDictSearch) {
-        ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(
-            cctxParams->compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
+        ZSTD_compressionParameters cParams = ZSTD_getCParamsFromCCtxParams(
+            cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
         return ZSTD_createCDict_advanced(dict, dictSize,
             dictLoadMethod, dictContentType, cParams,
             customMem);