From fe56eb9408004c5e9aacdbde59acb499b95831e2 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sat, 2 Apr 2016 00:21:55 +0200 Subject: [PATCH 1/4] removed unwanted files --- programs/result | 519 ---------------------------------------------- programs/tmp.mgz | Bin 5549 -> 0 bytes programs/tmp.zstd | Bin 6317 -> 0 bytes 3 files changed, 519 deletions(-) delete mode 100644 programs/result delete mode 100644 programs/tmp.mgz delete mode 100644 programs/tmp.zstd diff --git a/programs/result b/programs/result deleted file mode 100644 index 0d18ea646..000000000 --- a/programs/result +++ /dev/null @@ -1,519 +0,0 @@ -/* - bench.c - Demo module to benchmark open-source compression algorithms - Copyright (C) Yann Collet 2012-2015 - - GPL v2 License - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - You can contact the author at : - - zstd source repository : https://github.com/Cyan4973/zstd - - ztsd public forum : https://groups.google.com/forum/#!forum/lz4c -*/ - -/* ************************************** -* Compiler Options -****************************************/ -/* Disable some Visual warning messages */ -#ifdef _MSC_VER -# define _CRT_SECURE_NO_WARNINGS /* fopen */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -#endif - -/* Unix Large Files support (>4GB) */ -#define _FILE_OFFSET_BITS 64 -#if (defined(__sun__) && (!defined(__LP64__))) /* Sun Solaris 32-bits requires specific definitions */ -# define _LARGEFILE_SOURCE -#elif ! defined(__LP64__) /* No point defining Large file for 64 bit */ -# define _LARGEFILE64_SOURCE -#endif - - -/* ************************************* -* Includes -***************************************/ -#include /* malloc, free */ -#include /* memset */ -#include /* fprintf, fopen, ftello64 */ -#include /* stat64 */ -#include /* stat64 */ -#include /* clock_t, clock, CLOCKS_PER_SEC */ - -/* sleep : posix - windows - others */ -#if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))) -# include /* sleep */ -# include /* setpriority */ -# define BMK_sleep(s) sleep(s) -# define HIGH_PRIORITY setpriority(PRIO_PROCESS, 0, -20) -#elif defined(_WIN32) -# include -# define BMK_sleep(s) Sleep(1000*s) -# define HIGH_PRIORITY SetPriorityClass(GetCurrentProcess(), REALTIME_PRIORITY_CLASS); -#else -# define BMK_sleep(s) /* disabled */ -# define HIGH_PRIORITY -#endif - -#include "mem.h" -#include "zstd_static.h" -#include "xxhash.h" -#include "datagen.h" /* RDG_genBuffer */ - - -/* ************************************* -* Compiler specifics -***************************************/ -#if !defined(S_ISREG) -# define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) -#endif - -#ifdef _MSC_VER -#define snprintf sprintf_s -#endif - - -/* ************************************* -* Constants -***************************************/ -#define NBLOOPS 3 -#define TIMELOOP_S 1 -#define ACTIVEPERIOD_S 70 -#define COOLPERIOD_S 10 - -#define KB *(1 <<10) -#define MB *(1 <<20) -#define GB *(1U<<30) - -static const size_t maxMemory = (sizeof(size_t)==4) ? (2 GB - 64 MB) : (size_t)(1ULL << ((sizeof(size_t)*8)-31)); -#define DEFAULT_CHUNKSIZE (4 MB) - -static U32 g_compressibilityDefault = 50; - - -/* ************************************* -* console display -***************************************/ -#define DISPLAY(...) fprintf(stderr, __VA_ARGS__) -#define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); } -static U32 g_displayLevel = 2; /* 0 : no display; 1: errors; 2 : + result + interaction + warnings; 3 : + progression; 4 : + information */ - - -/* ************************************* -* Exceptions -***************************************/ -#ifndef DEBUG -# define DEBUG 0 -#endif -#define DEBUGOUTPUT(...) if (DEBUG) DISPLAY(__VA_ARGS__); -#define EXM_THROW(error, ...) \ -{ \ - DEBUGOUTPUT("Error defined at %s, line %i : \n", __FILE__, __LINE__); \ - DISPLAYLEVEL(1, "Error %i : ", error); \ - DISPLAYLEVEL(1, __VA_ARGS__); \ - DISPLAYLEVEL(1, "\n"); \ - exit(error); \ -} - - -/* ************************************* -* Benchmark Parameters -***************************************/ -static U32 g_nbIterations = NBLOOPS; -static size_t g_blockSize = 0; - -void BMK_SetNbIterations(unsigned nbLoops) -{ - g_nbIterations = nbLoops; - DISPLAY("- %i iterations -\n", g_nbIterations); -} - -void BMK_SetBlockSize(size_t blockSize) -{ - g_blockSize = blockSize; - DISPLAY("using blocks of size %u KB \n", (U32)(blockSize>>10)); -} - - -/* ******************************************************** -* Private functions -**********************************************************/ -static clock_t BMK_clockSpan( clock_t clockStart ) -{ - return clock() - clockStart; /* works even if overflow, span limited to <= ~30mn */ -} - - -static U64 BMK_getFileSize(const char* infilename) -{ - int r; -#if defined(_MSC_VER) - struct _stat64 statbuf; - r = _stat64(infilename, &statbuf); -#else - struct stat statbuf; - r = stat(infilename, &statbuf); -#endif - if (r || !S_ISREG(statbuf.st_mode)) return 0; /* No good... */ - return (U64)statbuf.st_size; -} - - -/* ******************************************************** -* Bench functions -**********************************************************/ -typedef struct -{ - const char* srcPtr; - size_t srcSize; - char* cPtr; - size_t cRoom; - size_t cSize; - char* resPtr; - size_t resSize; -} blockParam_t; - -#define MIN(a,b) ((a)<(b) ? (a) : (b)) -#define MAX(a,b) ((a)>(b) ? (a) : (b)) - -static int BMK_benchMem(const void* srcBuffer, size_t srcSize, - const char* displayName, int cLevel, - const size_t* fileSizes, U32 nbFiles, - const void* dictBuffer, size_t dictBufferSize) -{ - size_t const blockSize = (g_blockSize ? g_blockSize : srcSize) + (!srcSize); /* avoid div by 0 */ - U32 const maxNbBlocks = (U32) ((srcSize + (blockSize-1)) / blockSize) + nbFiles; - blockParam_t* const blockTable = (blockParam_t*) malloc(maxNbBlocks * sizeof(blockParam_t)); - size_t const maxCompressedSize = ZSTD_compressBound(srcSize) + (maxNbBlocks * 1024); /* add some room for safety */ - void* const compressedBuffer = malloc(maxCompressedSize); - void* const resultBuffer = malloc(srcSize); - ZSTD_CCtx* refCtx = ZSTD_createCCtx(); - ZSTD_CCtx* ctx = ZSTD_createCCtx(); - ZSTD_DCtx* refDCtx = ZSTD_createDCtx(); - ZSTD_DCtx* dctx = ZSTD_createDCtx(); - U32 nbBlocks; - - /* checks */ - if (!compressedBuffer || !resultBuffer || !blockTable || !refCtx || !ctx || !refDCtx || !dctx) - EXM_THROW(31, "not enough memory"); - - /* init */ - if (strlen(displayName)>17) displayName += strlen(displayName)-17; /* can only display 17 characters */ - HIGH_PRIORITY; - - /* Init blockTable data */ - { const char* srcPtr = (const char*)srcBuffer; - char* cPtr = (char*)compressedBuffer; - char* resPtr = (char*)resultBuffer; - U32 fileNb; - for (nbBlocks=0, fileNb=0; fileNb ACTIVEPERIOD_S * CLOCKS_PER_SEC) { - DISPLAY("\rcooling down ... \r"); - BMK_sleep(COOLPERIOD_S); - coolTime = clock(); - } - - /* Compression */ - DISPLAY("%2i-%-17.17s :%10u ->\r", testNb, displayName, (U32)srcSize); - memset(compressedBuffer, 0xE5, maxCompressedSize); /* warm up and erase result buffer */ - - clockStart = clock(); - while (clock() == clockStart); - clockStart = clock(); - { U32 nbLoops; - for (nbLoops = 0 ; BMK_clockSpan(clockStart) < clockLoop ; nbLoops++) { - U32 blockNb; - ZSTD_compressBegin_usingDict(refCtx, dictBuffer, dictBufferSize, cLevel); - for (blockNb=0; blockNb%10u (%5.3f),%6.1f MB/s\r", - testNb, displayName, (U32)srcSize, (U32)cSize, ratio, - (double)srcSize / 1000000. / (fastestC / CLOCKS_PER_SEC) ); - - (void)fastestD; (void)crcOrig; /* unused when decompression disabled */ -#if 1 - /* Decompression */ - memset(resultBuffer, 0xD6, srcSize); /* warm result buffer */ - - clockStart = clock(); - while (clock() == clockStart); - clockStart = clock(); - - { U32 nbLoops; - for (nbLoops = 0 ; BMK_clockSpan(clockStart) < clockLoop ; nbLoops++) { - U32 blockNb; - ZSTD_decompressBegin_usingDict(refDCtx, dictBuffer, dictBufferSize); - for (blockNb=0; blockNb%10u (%5.3f),%6.1f MB/s ,%6.1f MB/s\r", - testNb, displayName, (U32)srcSize, (U32)cSize, ratio, - (double)srcSize / 1000000. / (fastestC / CLOCKS_PER_SEC), - (double)srcSize / 1000000. / (fastestD / CLOCKS_PER_SEC) ); - - /* CRC Checking */ - { U64 const crcCheck = XXH64(resultBuffer, srcSize, 0); - if (crcOrig!=crcCheck) { - size_t u; - DISPLAY("!!! WARNING !!! %14s : Invalid Checksum : %x != %x \n", displayName, (unsigned)crcOrig, (unsigned)crcCheck); - for (u=0; u u) break; - bacc += blockTable[segNb].srcSize; - } - pos = (U32)(u - bacc); - bNb = pos / (128 KB); - DISPLAY("(block %u, sub %u, pos %u) \n", segNb, bNb, pos); - break; - } - if (u==srcSize-1) { /* should never happen */ - DISPLAY("no difference detected\n"); - } } - break; - } } /* CRC Checking */ -#endif - } /* for (testNb = 1; testNb <= (g_nbIterations + !g_nbIterations); testNb++) */ - DISPLAY("%2i#\n", cLevel); - } /* Bench */ - - /* clean up */ - free(compressedBuffer); - free(resultBuffer); - ZSTD_freeCCtx(refCtx); - ZSTD_freeCCtx(ctx); - ZSTD_freeDCtx(refDCtx); - ZSTD_freeDCtx(dctx); - return 0; -} - - -static size_t BMK_findMaxMem(U64 requiredMem) -{ - size_t const step = 64 MB; - BYTE* testmem = NULL; - - requiredMem = (((requiredMem >> 26) + 1) << 26); - requiredMem += step; - if (requiredMem > maxMemory) requiredMem = maxMemory; - - do { - testmem = (BYTE*)malloc((size_t)requiredMem); - requiredMem -= step; - } while (!testmem); - - free(testmem); - return (size_t)(requiredMem); -} - -static void BMK_benchCLevel(void* srcBuffer, size_t benchedSize, - const char* displayName, int cLevel, - const size_t* fileSizes, unsigned nbFiles, - const void* dictBuffer, size_t dictBufferSize) -{ - if (cLevel < 0) { /* range mode : test all levels from 1 to l */ - int l; - for (l=1; l <= -cLevel; l++) { - BMK_benchMem(srcBuffer, benchedSize, - displayName, l, - fileSizes, nbFiles, - dictBuffer, dictBufferSize); - } - return; - } - BMK_benchMem(srcBuffer, benchedSize, - displayName, cLevel, - fileSizes, nbFiles, - dictBuffer, dictBufferSize); -} - -static U64 BMK_getTotalFileSize(const char** fileNamesTable, unsigned nbFiles) -{ - U64 total = 0; - unsigned n; - for (n=0; n bufferSize-pos) fileSize = bufferSize-pos, nbFiles=n; /* buffer too small - stop after this file */ - { size_t const readSize = fread(((char*)buffer)+pos, 1, (size_t)fileSize, f); - if (readSize != (size_t)fileSize) EXM_THROW(11, "could not read %s", fileNamesTable[n]); - pos += readSize; } - fileSizes[n] = (size_t)fileSize; - fclose(f); - } -} - -static void BMK_benchFileTable(const char** fileNamesTable, unsigned nbFiles, - const char* dictFileName, int cLevel) -{ - void* srcBuffer; - size_t benchedSize; - void* dictBuffer = NULL; - size_t dictBufferSize = 0; - size_t* fileSizes = (size_t*)malloc(nbFiles * sizeof(size_t)); - U64 totalSizeToLoad = BMK_getTotalFileSize(fileNamesTable, nbFiles); - char mfName[20] = {0}; - const char* displayName = NULL; - - if (!fileSizes) EXM_THROW(12, "not enough memory for fileSizes"); - - /* Load dictionary */ - if (dictFileName != NULL) { - U64 dictFileSize = BMK_getFileSize(dictFileName); - if (dictFileSize > 64 MB) EXM_THROW(10, "dictionary file %s too large", dictFileName); - dictBufferSize = (size_t)dictFileSize; - dictBuffer = malloc(dictBufferSize); - if (dictBuffer==NULL) EXM_THROW(11, "not enough memory for dictionary (%u bytes)", (U32)dictBufferSize); - BMK_loadFiles(dictBuffer, dictBufferSize, fileSizes, &dictFileName, 1); - } - - /* Memory allocation & restrictions */ - benchedSize = BMK_findMaxMem(totalSizeToLoad * 3) / 3; - if ((U64)benchedSize > totalSizeToLoad) benchedSize = (size_t)totalSizeToLoad; - if (benchedSize < totalSizeToLoad) - DISPLAY("Not enough memory; testing %u MB only...\n", (U32)(benchedSize >> 20)); - srcBuffer = malloc(benchedSize); - if (!srcBuffer) EXM_THROW(12, "not enough memory"); - - /* Load input buffer */ - BMK_loadFiles(srcBuffer, benchedSize, fileSizes, fileNamesTable, nbFiles); - - /* Bench */ - snprintf (mfName, sizeof(mfName), " %u files", nbFiles); - if (nbFiles > 1) displayName = mfName; - else displayName = fileNamesTable[0]; - - BMK_benchCLevel(srcBuffer, benchedSize, - displayName, cLevel, - fileSizes, nbFiles, - dictBuffer, dictBufferSize); - - /* clean up */ - free(srcBuffer); - free(dictBuffer); - free(fileSizes); -} - - -static void BMK_syntheticTest(int cLevel, double compressibility) -{ - char name[20] = {0}; - size_t benchedSize = 10000000; - void* srcBuffer = malloc(benchedSize); - - /* Memory allocation */ - if (!srcBuffer) EXM_THROW(21, "not enough memory"); - - /* Fill input buffer */ - RDG_genBuffer(srcBuffer, benchedSize, compressibility, 0.0, 0); - - /* Bench */ - snprintf (name, sizeof(name), "Synthetic %2u%%", (unsigned)(compressibility*100)); - BMK_benchCLevel(srcBuffer, benchedSize, name, cLevel, &benchedSize, 1, NULL, 0); - - /* clean up */ - free(srcBuffer); -} - - -int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, - const char* dictFileName, int cLevel) -{ - double const compressibility = (double)g_compressibilityDefault / 100; - - if (nbFiles == 0) - BMK_syntheticTest(cLevel, compressibility); - else - BMK_benchFileTable(fileNamesTable, nbFiles, dictFileName, cLevel); - return 0; -} - diff --git a/programs/tmp.mgz b/programs/tmp.mgz deleted file mode 100644 index 165a506f973944c12a4a4dbf42d17b733097f1d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5549 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 diff --git a/programs/tmp.zstd b/programs/tmp.zstd deleted file mode 100644 index 6f0296f66bdaf65851b97f0f417482e182131ac2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6317 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 IA7Eer07CsVBme*a From 40358d01aa0ddd94e92b2cb7d9a2bd04f0f51b73 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sat, 2 Apr 2016 00:40:09 +0200 Subject: [PATCH 2/4] Fix : rare bugs when hashLog < min in bt mode --- lib/zstd_compress.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c index 31d81ea2a..65d7258d9 100644 --- a/lib/zstd_compress.c +++ b/lib/zstd_compress.c @@ -193,6 +193,7 @@ void ZSTD_adjustCParams(ZSTD_compressionParameters* params, U64 srcSize, size_t if (params->contentLog > maxContentLog) params->contentLog = maxContentLog; } /* <= ZSTD_CONTENTLOG_MAX */ if (params->windowLog < ZSTD_WINDOWLOG_ABSOLUTEMIN) params->windowLog = ZSTD_WINDOWLOG_ABSOLUTEMIN; /* required for frame header */ + if ((params->hashLog < ZSTD_HASHLOG_MIN) && ((U32)params->strategy >= (U32)ZSTD_btlazy2)) params->hashLog = ZSTD_HASHLOG_MIN; /* required to ensure collision resistance in bt */ } From ef36390e4a2cb51b28f9b4a1d33b47a6dcaf745a Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sat, 2 Apr 2016 00:46:40 +0200 Subject: [PATCH 3/4] refined exception for hashlog < min --- lib/zstd_compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c index 65d7258d9..5fe078fcd 100644 --- a/lib/zstd_compress.c +++ b/lib/zstd_compress.c @@ -164,8 +164,8 @@ size_t ZSTD_checkCParams_advanced(ZSTD_compressionParameters cParams, U64 srcSiz if (srcSize > (1ULL << ZSTD_WINDOWLOG_MIN)) return ZSTD_checkCParams(cParams); if (cParams.windowLog < ZSTD_WINDOWLOG_ABSOLUTEMIN) return ERROR(compressionParameter_unsupported); if (srcSize <= (1ULL << cParams.windowLog)) cParams.windowLog = ZSTD_WINDOWLOG_MIN; /* fake value - temporary work around */ - if (srcSize <= (1ULL << cParams.hashLog)) cParams.hashLog = ZSTD_HASHLOG_MIN; /* fake value - temporary work around */ if (srcSize <= (1ULL << cParams.contentLog)) cParams.contentLog = ZSTD_CONTENTLOG_MIN; /* fake value - temporary work around */ + if ((srcSize <= (1ULL << cParams.hashLog)) && ((U32)cParams.strategy < (U32)ZSTD_btlazy2)) cParams.hashLog = ZSTD_HASHLOG_MIN; /* fake value - temporary work around */ return ZSTD_checkCParams(cParams); } From 5a88a70f970780f93f57fbc29b98838ee530560f Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sun, 3 Apr 2016 20:24:25 +0200 Subject: [PATCH 4/4] fixed buffer sync error in zbuff --- lib/zbuff.c | 36 +++++++++++++++++++----------------- lib/zstd_decompress.c | 14 +++++++------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/zbuff.c b/lib/zbuff.c index 06a7ec4e8..721fad227 100644 --- a/lib/zbuff.c +++ b/lib/zbuff.c @@ -136,7 +136,7 @@ size_t ZBUFF_compressInit_advanced(ZBUFF_CCtx* zbc, zbc->inBuff = (char*)malloc(neededInBuffSize); if (zbc->inBuff == NULL) return ERROR(memory_allocation); } - zbc->blockSize = MIN(ZSTD_BLOCKSIZE_MAX, neededInBuffSize); + zbc->blockSize = MIN(ZSTD_BLOCKSIZE_MAX, neededInBuffSize/2); } if (zbc->outBuffSize < ZSTD_compressBound(zbc->blockSize)+1) { zbc->outBuffSize = ZSTD_compressBound(zbc->blockSize)+1; @@ -222,7 +222,7 @@ static size_t ZBUFF_compressContinue_generic(ZBUFF_CCtx* zbc, /* prepare next block */ zbc->inBuffTarget = zbc->inBuffPos + zbc->blockSize; if (zbc->inBuffTarget > zbc->inBuffSize) - { zbc->inBuffPos = 0; zbc->inBuffTarget = zbc->blockSize; } /* note : inBuffSize >= blockSize */ + zbc->inBuffPos = 0, zbc->inBuffTarget = zbc->blockSize; /* note : inBuffSize >= blockSize */ zbc->inToCompress = zbc->inBuffPos; if (cDst == op) { op += cSize; break; } /* no need to flush */ zbc->outBuffContentSize = cSize; @@ -326,10 +326,11 @@ typedef enum { ZBUFFds_init, ZBUFFds_readHeader, struct ZBUFF_DCtx_s { ZSTD_DCtx* zc; ZSTD_frameParams fParams; - char* inBuff; + size_t blockSize; + char* inBuff; size_t inBuffSize; size_t inPos; - char* outBuff; + char* outBuff; size_t outBuffSize; size_t outStart; size_t outEnd; @@ -405,20 +406,21 @@ size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbc, } } /* Frame header instruct buffer sizes */ - { size_t const neededInSize = ZSTD_BLOCKSIZE_MAX; /* a block is never > ZSTD_BLOCKSIZE_MAX */ - if (zbc->inBuffSize < neededInSize) { + { size_t const blockSize = MIN(1 << zbc->fParams.windowLog, ZSTD_BLOCKSIZE_MAX); + zbc->blockSize = blockSize; + if (zbc->inBuffSize < blockSize) { free(zbc->inBuff); - zbc->inBuffSize = neededInSize; - zbc->inBuff = (char*)malloc(neededInSize); + zbc->inBuffSize = blockSize; + zbc->inBuff = (char*)malloc(blockSize); if (zbc->inBuff == NULL) return ERROR(memory_allocation); - } } - { size_t const neededOutSize = (size_t)1 << zbc->fParams.windowLog; - if (zbc->outBuffSize < neededOutSize) { - free(zbc->outBuff); - zbc->outBuffSize = neededOutSize; - zbc->outBuff = (char*)malloc(neededOutSize); - if (zbc->outBuff == NULL) return ERROR(memory_allocation); - } } + } + { size_t const neededOutSize = ((size_t)1 << zbc->fParams.windowLog) + blockSize; + if (zbc->outBuffSize < neededOutSize) { + free(zbc->outBuff); + zbc->outBuffSize = neededOutSize; + zbc->outBuff = (char*)malloc(neededOutSize); + if (zbc->outBuff == NULL) return ERROR(memory_allocation); + } } } zbc->stage = ZBUFFds_read; case ZBUFFds_read: @@ -471,7 +473,7 @@ size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbc, zbc->outStart += flushedSize; if (flushedSize == toFlushSize) { zbc->stage = ZBUFFds_read; - if (zbc->outStart + ZSTD_BLOCKSIZE_MAX > zbc->outBuffSize) + if (zbc->outStart + zbc->blockSize > zbc->outBuffSize) zbc->outStart = zbc->outEnd = 0; break; } diff --git a/lib/zstd_decompress.c b/lib/zstd_decompress.c index 68bcaa8e1..fd9b40233 100644 --- a/lib/zstd_decompress.c +++ b/lib/zstd_decompress.c @@ -686,18 +686,18 @@ FORCE_INLINE size_t ZSTD_execSequence(BYTE* op, size_t const sequenceLength = sequence.litLength + sequence.matchLength; BYTE* const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ BYTE* const oend_8 = oend-8; - const BYTE* const litEnd = *litPtr + sequence.litLength; + const BYTE* const iLitEnd = *litPtr + sequence.litLength; const BYTE* match = oLitEnd - sequence.offset; /* check */ if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of 8 from oend */ if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */ - if (litEnd > litLimit_8) return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (iLitEnd > litLimit_8) return ERROR(corruption_detected); /* over-read beyond lit buffer */ /* copy Literals */ ZSTD_wildcopy(op, *litPtr, sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */ op = oLitEnd; - *litPtr = litEnd; /* update for next sequence */ + *litPtr = iLitEnd; /* update for next sequence */ /* copy Match */ if (sequence.offset > (size_t)(oLitEnd - base)) { @@ -761,7 +761,6 @@ static size_t ZSTD_decompressSequences( const BYTE* litPtr = dctx->litPtr; const BYTE* const litLimit_8 = litPtr + dctx->litBufSize - 8; const BYTE* const litEnd = litPtr + dctx->litSize; - int nbSeq; U32* DTableLL = dctx->LLTable; U32* DTableML = dctx->MLTable; U32* DTableOffb = dctx->OffTable; @@ -769,13 +768,14 @@ static size_t ZSTD_decompressSequences( const BYTE* const vBase = (const BYTE*) (dctx->vBase); const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd); const U32 mls = dctx->fParams.mml; + int nbSeq; /* Build Decoding Tables */ - { size_t const errorCode = ZSTD_decodeSeqHeaders(&nbSeq, + { size_t const seqHSize = ZSTD_decodeSeqHeaders(&nbSeq, DTableLL, DTableML, DTableOffb, ip, seqSize); - if (ZSTD_isError(errorCode)) return errorCode; - ip += errorCode; + if (ZSTD_isError(seqHSize)) return seqHSize; + ip += seqHSize; } /* Regen sequences */