AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restored variable output size fuzzer test

Browse Source 
Quickfix frame decompression
Small speed optimization frame decompression
This commit is contained in:
Yann Collet 2014-09-13 21:21:41 +01:00
parent 56c2b79ed0
commit 457dc35e6a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lz4frame.c
View File

@ -775,15 +775,6 @@ static void LZ4F_saveDict(LZ4F_dctx_internal_t* dctxPtr, const BYTE* decoded, si
static void LZ4F_pointDict(LZ4F_dctx_internal_t* dctxPtr, const BYTE* decoded, size_t decodedSize)
{
/* large decoded block */
if (decodedSize >= (64 KB - 1))
{
dctxPtr->dict = (BYTE*)decoded;
dctxPtr->dictSize = decodedSize;
dctxPtr->tmpOut = dctxPtr->tmpOutBuffer + 64 KB;
return;
}
/* decoded block in the continuity of dictionary */
if (dctxPtr->dict + dctxPtr->dictSize == decoded)
{
@ -800,6 +791,15 @@ static void LZ4F_pointDict(LZ4F_dctx_internal_t* dctxPtr, const BYTE* decoded, s
return;
}
/* large decoded block */
if (decodedSize >= (64 KB - 1))
{
dctxPtr->dict = (BYTE*)decoded;
dctxPtr->dictSize = decodedSize;
dctxPtr->tmpOut = dctxPtr->tmpOutBuffer + 64 KB;
return;
}
/* small block, and not contiguous : let's save that */
LZ4F_saveDict(dctxPtr, decoded, decodedSize);
}
@ -953,6 +953,11 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext,
break;
}
dctxPtr->dStage = dstage_getCBlock;
if (dstPtr==dstEnd)
{
nextSrcSizeHint = nextCBlockSize + 4;
doAnotherStage = 0;
}
break;
}

5
programs/frametest.c
View File

@ -466,12 +466,11 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi
while (ip < iend)
{
unsigned nbBitsI = (FUZ_rand(&randState) % (maxBits-1)) + 1;
unsigned nbBitsO = (FUZ_rand(&randState) % (maxBits-1)) + 1;
unsigned nbBitsO = (FUZ_rand(&randState) % (maxBits)) + 1;
size_t iSize = (FUZ_rand(&randState) & ((1<<nbBitsI)-1)) + 1;
size_t oSize = (FUZ_rand(&randState) & ((1<<nbBitsO)-1)) + 1;
size_t oSize = (FUZ_rand(&randState) & ((1<<nbBitsO)-1)) + 2;
if (iSize > (size_t)(iend-ip)) iSize = iend-ip;
if (oSize > (size_t)(oend-op)) oSize = oend-op;
oSize = oend-op;
result = LZ4F_decompress(dCtx, op, &oSize, ip, &iSize, NULL);
if (result == (size_t)-ERROR_checksum_invalid) locateBuffDiff((BYTE*)srcBuffer+srcStart, decodedBuffer, srcSize);
CHECK(LZ4F_isError(result), "Decompression failed (error %i)", (int)result);