Merge branch 'dev' into negLevels

diff --cc lib/compress/zstd_compress.c
index 2c566dd395d2c14f9969373f9bb4fe44f6b397c5,e0c29ac44cce201e40a9e67217f5a48cac31bd28..26bb542296b1823e100038a1335a559b7de5de1c
--- 1/lib/compress/zstd_compress.c
--- 2/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -708,7 -707,9 +709,7 @@@ ZSTD_clampCParams(ZSTD_compressionParam
      CLAMP(cParams.hashLog, ZSTD_HASHLOG_MIN, ZSTD_HASHLOG_MAX);
      CLAMP(cParams.searchLog, ZSTD_SEARCHLOG_MIN, ZSTD_SEARCHLOG_MAX);
      CLAMP(cParams.searchLength, ZSTD_SEARCHLENGTH_MIN, ZSTD_SEARCHLENGTH_MAX);
-     if ((U32)(cParams.strategy) > (U32)ZSTD_btultra) cParams.strategy = ZSTD_btultra;
 -    if ((U32)(cParams.targetLength) < ZSTD_TARGETLENGTH_MIN)
 -        cParams.targetLength = ZSTD_TARGETLENGTH_MIN;
+     CLAMP(cParams.strategy, ZSTD_fast, ZSTD_btultra);
      return cParams;
  }
  

diff --cc lib/compress/zstd_compress_internal.h
Simple merge

diff --cc tests/fuzzer.c
Simple merge