ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fuzzer32 litCSize limit condition

Browse Source
This commit is contained in:
Yann Collet
2015-11-04 23:36:36 +01:00
parent 50c5cdb44c
commit 3137d1a059
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zstd.c
-2
View File
@@ -120,8 +120,6 @@
#define GB *(1U<<30) #define GB *(1U<<30)
#define BLOCKSIZE (128 KB) /* define, for static allocation */ #define BLOCKSIZE (128 KB) /* define, for static allocation */
#define MIN_SEQUENCES_SIZE (2 /*seqNb*/ + 2 /*dumps*/ + 3 /*seqTables*/ + 1 /*bitStream*/)
#define MIN_CBLOCK_SIZE (3 /*litCSize*/ + MIN_SEQUENCES_SIZE)
#define IS_RAW BIT0 #define IS_RAW BIT0
#define IS_RLE BIT1 #define IS_RLE BIT1
lib/zstd_internal.h
+4
View File
@@ -214,6 +214,10 @@ void ZSTD_resetSeqStore(seqStore_t* ssPtr);
#define MaxLL ((1<<LLbits) - 1) #define MaxLL ((1<<LLbits) - 1)
#define MaxOff 31 #define MaxOff 31
#define MIN_SEQUENCES_SIZE (2 /*seqNb*/ + 2 /*dumps*/ + 3 /*seqTables*/ + 1 /*bitStream*/)
#define MIN_CBLOCK_SIZE (3 /*litCSize*/ + MIN_SEQUENCES_SIZE)
/** ZSTD_storeSeq /** ZSTD_storeSeq
Store a sequence (literal length, literals, offset code and match length) into seqStore_t Store a sequence (literal length, literals, offset code and match length) into seqStore_t
@offsetCode : distance to match, or 0 == repCode @offsetCode : distance to match, or 0 == repCode
lib/zstdhc.c
+1 -1
View File
@@ -953,7 +953,7 @@ static size_t ZSTD_HC_compress_generic (ZSTD_HC_CCtx* ctxPtr,
{ {
size_t cSize; size_t cSize;
if (maxDstSize < 5) return ERROR(dstSize_tooSmall); /* not enough space to store compressed block */ if (maxDstSize < 3 + MIN_CBLOCK_SIZE) return ERROR(dstSize_tooSmall); /* not enough space to store compressed block */
if (remaining < blockSize) blockSize = remaining; if (remaining < blockSize) blockSize = remaining;
cSize = blockCompressor(ctxPtr, op+3, maxDstSize-3, ip, blockSize); cSize = blockCompressor(ctxPtr, op+3, maxDstSize-3, ip, blockSize);