From: Sen Huang <senhuang96@fb.com>
Date: Wed, 17 Mar 2021 00:36:05 +0000 (-0700)
Subject: Fix ZSTD_dedicatedDictSearch_isSupported() requirements
X-Git-Tag: v1.4.10~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ae664ba635e6f47998ed84459ae511fbe256e0;p=thirdparty%2Fzstd.git

Fix ZSTD_dedicatedDictSearch_isSupported() requirements
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 93c4075c5..0232be044 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -5186,7 +5186,10 @@ static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams(int const
 static int ZSTD_dedicatedDictSearch_isSupported(
         ZSTD_compressionParameters const* cParams)
 {
-    return (cParams->strategy >= ZSTD_greedy) && (cParams->strategy <= ZSTD_lazy2);
+    return (cParams->strategy >= ZSTD_greedy)
+        && (cParams->strategy <= ZSTD_lazy2)
+        && (cParams->hashLog >= cParams->chainLog)
+        && (cParams->chainLog <= 24);
 }
 
 /**
diff --git a/tests/playTests.sh b/tests/playTests.sh
index da0e67a35..2dfb4fa07 100755
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -805,6 +805,8 @@ println "- Dictionary compression roundtrip"
 zstd -f tmp -D tmpDict
 zstd -d tmp.zst -D tmpDict -fo result
 $DIFF "$TESTFILE" result
+println "- Dictionary compression with hlog < clog"
+zstd -6f tmp -D tmpDict --zstd=clog=25,hlog=23
 println "- Dictionary compression with btlazy2 strategy"
 zstd -f tmp -D tmpDict --zstd=strategy=6
 zstd -d tmp.zst -D tmpDict -fo result