commit 8977224b9b3c29b3ef0a4137db55efb313b5fae1
author Yann Collet <Cyan4973@users.noreply.github.com> Fri Sep 22 09:01:39 2017 -0700
committer GitHub <noreply@github.com> Fri Sep 22 09:01:39 2017 -0700
tree 01a743faf79d7d7c8d106eb6e02b3b2c30bd729c
parent 14946af10caf48b8b1ac550a0dec65c0d4233ee8
parent d6abb28951e01cb4042d1e075c822106c31b7d49

Merge pull request #859 from terrelln/31

Prepare for ZSTD_WINDOWLOG_MAX == 31

lib/decompress/zstd_decompress.c

diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index b07d77c..cd64f3b 100644
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -1546,6 +1546,10 @@
         if (blockProperties.lastBlock) break;
     }
 
+    if (dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) {
+        if ((U64)(op-ostart) != dctx->fParams.frameContentSize) {
+            return ERROR(corruption_detected);
+    }   }
     if (dctx->fParams.checksumFlag) { /* Frame content checksum verification */
         U32 const checkCalc = (U32)XXH64_digest(&dctx->xxhState);
         U32 checkRead;

tests/fuzzer.c

diff --git a/tests/fuzzer.c b/tests/fuzzer.c
index 2bc5c9d..bfa290c 100644
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@ -811,7 +811,7 @@
         }
         DISPLAYLEVEL(4, "OK \n");
 
-        DISPLAYLEVEL(4, "test%3i : Loading rawContent starting with dict header w/ ZSTD_dm_auto should fail", testNb++);
+        DISPLAYLEVEL(4, "test%3i : Loading rawContent starting with dict header w/ ZSTD_dm_auto should fail : ", testNb++);
         {
             size_t ret;
             MEM_writeLE32((char*)dictBuffer+2, ZSTD_MAGIC_DICTIONARY);
@@ -821,7 +821,7 @@
         }
         DISPLAYLEVEL(4, "OK \n");
 
-        DISPLAYLEVEL(4, "test%3i : Loading rawContent starting with dict header w/ ZSTD_dm_rawContent should pass", testNb++);
+        DISPLAYLEVEL(4, "test%3i : Loading rawContent starting with dict header w/ ZSTD_dm_rawContent should pass : ", testNb++);
         {
             size_t ret;
             MEM_writeLE32((char*)dictBuffer+2, ZSTD_MAGIC_DICTIONARY);