mirrors/lz4
0
0
Fork 0
mirror of https://github.com/lz4/lz4.git synced 2024-11-27 03:48:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

created new test case bug1227

Browse Source 
and shipped the associated fix,
as suggested by @QrczakMK
This commit is contained in:
Yann Collet 2023-09-11 19:10:11 -07:00
parent 2acbb0f1a4
commit f10aaa0af4
2 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/lz4frame.c
View File

@ -1268,13 +1268,14 @@ LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_dctx* dctx)
/*==--- Streaming Decompression operations ---==*/
void LZ4F_resetDecompressionContext(LZ4F_dctx* dctx)
{
DEBUGLOG(5, "LZ4F_resetDecompressionContext");
dctx->dStage = dstage_getFrameHeader;
dctx->dict = NULL;
dctx->dictSize = 0;
dctx->skipChecksum = 0;
dctx->frameRemainingSize = 0;
}
@ -1331,6 +1332,7 @@ static size_t LZ4F_decodeHeader(LZ4F_dctx* dctx, const void* src, size_t srcSize
if (((FLG>>1)&_1BIT) != 0) RETURN_ERROR(reservedFlag_set); /* Reserved bit */
if (version != 1) RETURN_ERROR(headerVersion_wrong); /* Version Number, only supported value */
}
DEBUGLOG(6, "contentSizeFlag: %u", contentSizeFlag);
/* Frame Header Size */
frameHeaderSize = minFHSize + (contentSizeFlag?8:0) + (dictIDFlag?4:0);
@ -1367,8 +1369,9 @@ static size_t LZ4F_decodeHeader(LZ4F_dctx* dctx, const void* src, size_t srcSize
dctx->frameInfo.contentChecksumFlag = (LZ4F_contentChecksum_t)contentChecksumFlag;
dctx->frameInfo.blockSizeID = (LZ4F_blockSizeID_t)blockSizeID;
dctx->maxBlockSize = LZ4F_getBlockSize((LZ4F_blockSizeID_t)blockSizeID);
if (contentSizeFlag)
if (contentSizeFlag) {
dctx->frameRemainingSize = dctx->frameInfo.contentSize = LZ4F_readLE64(srcPtr+6);
}
if (dictIDFlag)
dctx->frameInfo.dictID = LZ4F_readLE32(srcPtr + frameHeaderSize - 5);

63
tests/frametest.c
View File

@ -215,6 +215,64 @@ static unsigned FUZ_highbit(U32 v32)
/*-*******************************************************
* Tests
*********************************************************/
#define CONTROL(c) { \
if (!(c)) { \
DISPLAY("Error (line %i) => %s not respected \n", __LINE__, #c); \
return 1; \
} }
static int bug1227(void)
{
LZ4F_dctx* dctx;
CONTROL(!LZ4F_isError(LZ4F_createDecompressionContext(&dctx, LZ4F_VERSION)));
/* first session */
{ const char s9Buffer[9] = { 0 };
char d9Buffer[sizeof(s9Buffer)];
size_t const c9SizeBound = LZ4F_compressFrameBound(sizeof(s9Buffer), NULL);
void* const c9Buffer = malloc(c9SizeBound);
/* First compress a valid frame */
LZ4F_preferences_t pref = LZ4F_INIT_PREFERENCES;
pref.frameInfo.contentSize = sizeof(s9Buffer);
CONTROL(c9Buffer != NULL);
{ size_t const c9Size = LZ4F_compressFrame(c9Buffer, c9SizeBound, s9Buffer, sizeof(s9Buffer), &pref);
CONTROL(!LZ4F_isError(c9Size));
assert(c9Size > 15);
/* decompress it, but do not complete the process - state not terminated correctly */
{ size_t dstSize = sizeof(d9Buffer);
size_t srcSize = 15;
size_t const d9Size = LZ4F_decompress(dctx, d9Buffer, &dstSize, c9Buffer, &srcSize, NULL);
CONTROL(!LZ4F_isError(d9Size));
CONTROL(srcSize < c9Size); /* not entirely consumed */
}
}
free(c9Buffer);
}
LZ4F_resetDecompressionContext(dctx); /* unfinished session -> reset should make it clean */
/* second session : generate a valid 0-size frame with no content size field (default) */
{ size_t const c0SizeBound = LZ4F_compressFrameBound(0, NULL);
void* const c0Buffer = malloc(c0SizeBound);
char d0Buffer[1];
CONTROL(c0Buffer != NULL);
{ size_t const c0Size = LZ4F_compressFrame(c0Buffer, c0SizeBound, NULL, 0, NULL);
CONTROL(!LZ4F_isError(c0Size));
/* now decompress this valid empty frame */
{ size_t dstSize = sizeof(d0Buffer);
size_t srcSize = c0Size;
size_t const d0Size = LZ4F_decompress(dctx, d0Buffer, &dstSize, c0Buffer, &srcSize, NULL);
CONTROL(!LZ4F_isError(d0Size));
CONTROL(dstSize == 0);
CONTROL(srcSize == c0Size);
} }
free(c0Buffer);
}
LZ4F_freeDecompressionContext(dctx);
return 0;
}
#define CHECK_V(v,f) v = f; if (LZ4F_isError(v)) { fprintf(stderr, "%s \n", LZ4F_getErrorName(v)); goto _output_error; }
#define CHECK(f) { LZ4F_errorCode_t const CHECK_V(err_ , f); }
@ -764,6 +822,9 @@ static int unitTests(U32 seed, double compressibility)
goto _output_error;
}
DISPLAYLEVEL(3, "check bug1227: reused dctx after error => ");
if (bug1227()) goto _output_error;
DISPLAYLEVEL(3, "OK \n");
DISPLAYLEVEL(3, "Skippable frame test : \n");
{ size_t decodedBufferSize = COMPRESSIBLE_NOISE_LENGTH;
@ -1026,7 +1087,7 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi
for ( ; (testNb < nbTests) || (clockDuration > FUZ_GetClockSpan(startClock)) ; testNb++) {
U32 randState = coreRand ^ prime1;
unsigned const srcBits = (FUZ_rand(&randState) % (FUZ_highbit((U32)(CNBufferLength-1)) - 1)) + 1;
size_t const srcSize = (FUZ_rand(&randState) & ((1<<srcBits)-1)) + 1;
size_t const srcSize = (FUZ_rand(&randState) & ((1<<srcBits)-1));
size_t const srcStartId = FUZ_rand(&randState) % (CNBufferLength - srcSize);
const BYTE* const srcStart = (const BYTE*)CNBuffer + srcStartId;
unsigned const neverFlush = (FUZ_rand(&randState) & 15) == 1;