From: Bimba Shrestha <bimbashrestha@fb.com>
Date: Sat, 23 Nov 2019 01:29:33 +0000 (-0800)
Subject: Merge branch 'dev' into oss
X-Git-Tag: v1.4.5^2~132^2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=826b555463faed2aef505a931d054c3f63354474;p=thirdparty%2Fzstd.git

Merge branch 'dev' into oss
---

826b555463faed2aef505a931d054c3f63354474
diff --cc tests/fuzzer.c
index 8dbaa3384,a59916446..56936e9f0
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@@ -489,18 -490,18 +489,31 @@@ static int basicUnitTests(U32 const see
      }
      DISPLAYLEVEL(3, "OK \n");
  
 +    DISPLAYLEVEL(3, "test%3d: superblock enough room for checksum : ", testNb++)
 +    {
 +        /* This tests whether or not we leave enough room for the checksum at the end
 +         * of the dst buffer. The bug that motivated this test was found by the
 +         * stream_round_trip fuzzer but this crashes for the same reason and is
 +         * far more compact than re-creating the stream_round_trip fuzzer's code path */
 +        ZSTD_CCtx *cctx = ZSTD_createCCtx();
 +        ZSTD_CCtx_setParameter(cctx, ZSTD_c_targetCBlockSize, 64);
 +        assert(!ZSTD_isError(ZSTD_compress2(cctx, compressedBuffer, 1339, CNBuffer, 1278)));
 +        ZSTD_freeCCtx(cctx);
 +    }
 +    DISPLAYLEVEL(3, "OK \n");
++  
+     DISPLAYLEVEL(3, "test%3i : compress a NULL input with each level : ", testNb++);
+     {   int level = -1;
+         ZSTD_CCtx* cctx = ZSTD_createCCtx();
+         if (!cctx) goto _output_error;
+         for (level = -1; level <= ZSTD_maxCLevel(); ++level) {
+           CHECK_Z( ZSTD_compress(compressedBuffer, compressedBufferSize, NULL, 0, level) );
+           CHECK_Z( ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, level) );
+           CHECK_Z( ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, NULL, 0) );
+         }
+         ZSTD_freeCCtx(cctx);
+     }
+     DISPLAYLEVEL(3, "OK \n");
  
      DISPLAYLEVEL(3, "test%3d : check CCtx size after compressing empty input : ", testNb++);
      {   ZSTD_CCtx* const cctx = ZSTD_createCCtx();