diff options
author | Yann Collet <Cyan4973@users.noreply.github.com> | 2018-12-02 16:50:08 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-02 16:50:08 (GMT) |
commit | 4d60ecc9c77e7db447a06321e28533ffbd4ce6a9 (patch) | |
tree | 6f1e71036c7c53eb23481c8473c6652dae6059b4 | |
parent | 3b8253a4bcc847b25fa58b417a859f4f3777456d (diff) | |
parent | 49073aca8606131bb73ca1471219d63b27d2602f (diff) | |
download | lz4-4d60ecc9c77e7db447a06321e28533ffbd4ce6a9.zip lz4-4d60ecc9c77e7db447a06321e28533ffbd4ce6a9.tar.gz lz4-4d60ecc9c77e7db447a06321e28533ffbd4ce6a9.tar.bz2 |
Merge pull request #612 from lzutao/fix_clang_fuzzer
Fix clang warning
-rw-r--r-- | tests/frametest.c | 2 | ||||
-rw-r--r-- | tests/fuzzer.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/frametest.c b/tests/frametest.c index 6d2cdd0..b93f4fe 100644 --- a/tests/frametest.c +++ b/tests/frametest.c @@ -160,7 +160,7 @@ static unsigned FUZ_highbit(U32 v32) { unsigned nbBits = 0; if (v32==0) return 0; - while (v32) v32 >>= 1, nbBits ++; + while (v32) {v32 >>= 1; nbBits ++;} return nbBits; } diff --git a/tests/fuzzer.c b/tests/fuzzer.c index 1d23e1a..fab1fce 100644 --- a/tests/fuzzer.c +++ b/tests/fuzzer.c @@ -508,7 +508,7 @@ static int FUZ_test(U32 seed, U32 nbCycles, const U32 startCycle, const double c /* Test decoding with a one byte input */ FUZ_DISPLAYTEST("LZ4_decompress_safe() with one byte input"); - { char const tmp = 0xFF; + { char const tmp = (char)0xFF; LZ4_decompress_safe(&tmp, decodedBuffer, 1, blockSize); } @@ -518,7 +518,7 @@ static int FUZ_test(U32 seed, U32 nbCycles, const U32 startCycle, const double c /* 14 bytes of literals, followed by a 14 byte match. * Should not read beyond the end of the buffer. * See https://github.com/lz4/lz4/issues/508. */ - *tmp = 0xEE; + *tmp = (char)0xEE; memset(tmp + 1, 0, 14); tmp[15] = 14; tmp[16] = 0; @@ -678,7 +678,8 @@ static int FUZ_test(U32 seed, U32 nbCycles, const U32 startCycle, const double c FUZ_CHECKTEST(ret>0, "LZ4_compress_fast_continue using ExtDict should fail : one missing byte for output buffer : %i written, %i buffer", ret, blockContinueCompressedSize); FUZ_DISPLAYTEST("test LZ4_compress_fast_continue() with dictionary loaded with LZ4_loadDict()"); - DISPLAYLEVEL(5, " compress %i bytes from buffer(%p) into dst(%p) using dict(%p) of size %i \n", blockSize, block, decodedBuffer, dict, dictSize); + DISPLAYLEVEL(5, " compress %i bytes from buffer(%p) into dst(%p) using dict(%p) of size %i \n", + blockSize, (const void *)block, (void *)decodedBuffer, (const void *)dict, dictSize); LZ4_loadDict(&LZ4dict, dict, dictSize); ret = LZ4_compress_fast_continue(&LZ4dict, block, compressedBuffer, blockSize, blockContinueCompressedSize, 1); FUZ_CHECKTEST(ret!=blockContinueCompressedSize, "LZ4_compress_limitedOutput_compressed size is different (%i != %i)", ret, blockContinueCompressedSize); @@ -686,7 +687,8 @@ static int FUZ_test(U32 seed, U32 nbCycles, const U32 startCycle, const double c /* Decompress with dictionary as external */ FUZ_DISPLAYTEST("test LZ4_decompress_fast_usingDict() with dictionary as extDict"); - DISPLAYLEVEL(5, " decoding %i bytes from buffer(%p) using dict(%p) of size %i \n", blockSize, decodedBuffer, dict, dictSize); + DISPLAYLEVEL(5, " decoding %i bytes from buffer(%p) using dict(%p) of size %i \n", + blockSize, (void *)decodedBuffer, (const void *)dict, dictSize); decodedBuffer[blockSize] = 0; ret = LZ4_decompress_fast_usingDict(compressedBuffer, decodedBuffer, blockSize, dict, dictSize); FUZ_CHECKTEST(ret!=blockContinueCompressedSize, "LZ4_decompress_fast_usingDict did not read all compressed block input"); |