diff options
author | Yann Collet <yann.collet.73@gmail.com> | 2015-04-12 08:29:52 (GMT) |
---|---|---|
committer | Yann Collet <yann.collet.73@gmail.com> | 2015-04-12 08:29:52 (GMT) |
commit | 81fdd9df23821d5db8331e66478e2617b470820c (patch) | |
tree | 654af31034b520af11aec51d366d8255c96aaaba /lib | |
parent | 66b8a4a8afe72ac37a26199249a78a5349201472 (diff) | |
download | lz4-81fdd9df23821d5db8331e66478e2617b470820c.zip lz4-81fdd9df23821d5db8331e66478e2617b470820c.tar.gz lz4-81fdd9df23821d5db8331e66478e2617b470820c.tar.bz2 |
Fixed a few Valgrind warnings
Diffstat (limited to 'lib')
-rw-r--r-- | lib/lz4.c | 5 | ||||
-rw-r--r-- | lib/lz4hc.c | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -756,6 +756,7 @@ int LZ4_freeStream (LZ4_stream_t* LZ4_stream) } +#define HASH_UNIT sizeof(size_t) int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize) { LZ4_stream_t_internal* dict = (LZ4_stream_t_internal*) LZ4_dict; @@ -765,7 +766,7 @@ int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize) if (dict->initCheck) LZ4_resetStream(LZ4_dict); /* Uninitialized structure detected */ - if (dictSize < MINMATCH) + if (dictSize < HASH_UNIT) { dict->dictionary = NULL; dict->dictSize = 0; @@ -778,7 +779,7 @@ int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize) dict->dictSize = (U32)(dictEnd - p); dict->currentOffset += dict->dictSize; - while (p <= dictEnd-MINMATCH) + while (p <= dictEnd-HASH_UNIT) { LZ4_putPosition(p, dict, byU32, base); p+=3; diff --git a/lib/lz4hc.c b/lib/lz4hc.c index 234e1af..4f1272c 100644 --- a/lib/lz4hc.c +++ b/lib/lz4hc.c @@ -656,7 +656,7 @@ int LZ4_saveDictHC (LZ4_streamHC_t* LZ4_streamHCPtr, char* safeBuffer, int dictS if (dictSize > 64 KB) dictSize = 64 KB; if (dictSize < 4) dictSize = 0; if (dictSize > prefixSize) dictSize = prefixSize; - memcpy(safeBuffer, streamPtr->end - dictSize, dictSize); + memmove(safeBuffer, streamPtr->end - dictSize, dictSize); { U32 endIndex = (U32)(streamPtr->end - streamPtr->base); streamPtr->end = (const BYTE*)safeBuffer + dictSize; |