From: Yann Collet <yann.collet.73@gmail.com>
Date: Mon, 6 Jun 2016 15:50:07 +0000 (+0200)
Subject: fixed initialization issue in bench
X-Git-Tag: v0.7.0^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc72f1fd35b9778181f6e2fe554d6ca162450d0;p=thirdparty%2Fzstd.git

fixed initialization issue in bench
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 48ca30e49..9c06f603c 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2148,7 +2148,7 @@ static size_t ZSTD_writeFrameHeader(void* dst, size_t dstCapacity,
                                     ZSTD_parameters params, U64 pledgedSrcSize, U32 dictID)
 {   BYTE* const op = (BYTE*)dst;
     U32 const dictIDSizeCode = (dictID>0) + (dictID>=256) + (dictID>=65536);   /* 0-3 */
-    U32 const checksumFlag = params.fParams.checksumFlag;
+    U32 const checksumFlag = params.fParams.checksumFlag>0;
     U32 const windowSize = 1U << params.cParams.windowLog;
     U32 const directModeFlag = params.fParams.contentSizeFlag && (windowSize > (pledgedSrcSize-1));
     BYTE const windowLogByte = (BYTE)((params.cParams.windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN) << 3);
diff --git a/programs/bench.c b/programs/bench.c
index 08a972c75..ecc609d83 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -219,6 +219,7 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                 do {
                     U32 blockNb;
                     {   ZSTD_parameters params;
+                        memset(&params, 0, sizeof(params));
                         params.cParams = ZSTD_getCParams(cLevel, blockSize, dictBufferSize);
                         params.fParams.contentSizeFlag = 1;
                         {   size_t const initResult = ZSTD_compressBegin_advanced(refCtx, dictBuffer, dictBufferSize, params, blockSize);
diff --git a/programs/fileio.c b/programs/fileio.c
index 37f6e7822..47302f9ca 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -622,7 +622,6 @@ unsigned long long FIO_decompressFrame(dRess_t ress,
 
     /* Main decompression Loop */
     while (1) {
-        /* Decode */
         size_t inSize=readSize, decodedSize=ress.dstBufferSize;
         size_t const toRead = ZBUFF_decompressContinue(ress.dctx, ress.dstBuffer, &decodedSize, ress.srcBuffer, &inSize);
         if (ZBUFF_isError(toRead)) EXM_THROW(36, "Decoding error : %s", ZBUFF_getErrorName(toRead));