diff options
| -rw-r--r-- | lib/lz4.c | 5 | ||||
| -rw-r--r-- | lib/lz4frame.c | 2 | ||||
| -rw-r--r-- | programs/frametest.c | 5 |
3 files changed, 3 insertions, 9 deletions
@@ -1103,7 +1103,7 @@ FORCE_INLINE int LZ4_decompress_generic( int partialDecoding, /* full, partial */ int targetOutputSize, /* only used if partialDecoding==partial */ int dict, /* noDict, withPrefix64k, usingExtDict */ - const BYTE* const lowPrefix, /* == dest if dict == noDict */ + const BYTE* const lowPrefix, /* == dest when no prefix */ const BYTE* const dictStart, /* only if dict==usingExtDict */ const size_t dictSize /* note : = 0 if noDict */ ) @@ -1385,8 +1385,7 @@ FORCE_INLINE int LZ4_decompress_usingDict_generic(const char* source, char* dest { if (dictSize==0) return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest, NULL, 0); - if (dictStart+dictSize == dest) - { + if (dictStart+dictSize == dest) { if (dictSize >= (int)(64 KB - 1)) return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, withPrefix64k, (BYTE*)dest-64 KB, NULL, 0); return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest-dictSize, NULL, 0); diff --git a/lib/lz4frame.c b/lib/lz4frame.c index 1dc2bca..4cf259f 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -1184,7 +1184,7 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext, } selectedIn = dctxPtr->tmpIn; dctxPtr->dStage = dstage_decodeCBlock; - break; + /* pass-through */ } case dstage_decodeCBlock: diff --git a/programs/frametest.c b/programs/frametest.c index e8f6975..4322ab8 100644 --- a/programs/frametest.c +++ b/programs/frametest.c @@ -654,7 +654,6 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi { const BYTE* ip = (const BYTE*)compressedBuffer; const BYTE* const iend = ip + cSize; - DISPLAY("cSize : %u ; srcSize : %u \n", (U32)cSize, (U32)srcDataLength); BYTE* op = (BYTE*)decodedBuffer; BYTE* const oend = op + srcDataLength; size_t totalOut = 0; @@ -672,11 +671,7 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi if (oSize > (size_t)(oend-op)) oSize = oend-op; dOptions.stableDst = FUZ_rand(&randState) & 1; if (nonContiguousDst==2) dOptions.stableDst = 0; - DISPLAY("in : %u / %u ; out : %u / %u \n", (U32)iSize, (U32)(iend-ip), (U32)oSize, (U32)(oend-op)); - if (iSize == 107662) - iSize += !iSize; result = LZ4F_decompress(dCtx, op, &oSize, ip, &iSize, &dOptions); - DISPLAY("consumed : %u ; generated : %u ; hint : %u \n", (U32)iSize, (U32)oSize, (U32)result); if (result == (size_t)-LZ4F_ERROR_contentChecksum_invalid) locateBuffDiff((BYTE*)srcBuffer+srcStart, decodedBuffer, srcSize, nonContiguousDst); CHECK(LZ4F_isError(result), "Decompression failed (error %i:%s)", (int)result, LZ4F_getErrorName((LZ4F_errorCode_t)result)); |