diff options
| author | Yann Collet <cyan@fb.com> | 2020-11-09 07:26:19 (GMT) |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2020-11-09 07:26:19 (GMT) |
| commit | 44b13db53201927814a21cd962ad5979745e2d17 (patch) | |
| tree | 80efbddc428e41d7b2abcc5ad158cd812daceeff /lib/lz4hc.c | |
| parent | 52646e8d7517b9b399d3e3719c65816afdc833ab (diff) | |
| parent | 9cf3f106a8dea906ff4550f749112e9e89536678 (diff) | |
| download | lz4-44b13db53201927814a21cd962ad5979745e2d17.zip lz4-44b13db53201927814a21cd962ad5979745e2d17.tar.gz lz4-44b13db53201927814a21cd962ad5979745e2d17.tar.bz2 | |
Merge branch 'dev' into customMem
Diffstat (limited to 'lib/lz4hc.c')
| -rw-r--r-- | lib/lz4hc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/lz4hc.c b/lib/lz4hc.c index 8320f33..8c6063f 100644 --- a/lib/lz4hc.c +++ b/lib/lz4hc.c @@ -1163,13 +1163,16 @@ 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; - memmove(safeBuffer, streamPtr->end - dictSize, dictSize); + if (safeBuffer == NULL) assert(dictSize == 0); + if (dictSize > 0) + memmove(safeBuffer, streamPtr->end - dictSize, dictSize); { U32 const endIndex = (U32)(streamPtr->end - streamPtr->base); streamPtr->end = (const BYTE*)safeBuffer + dictSize; streamPtr->base = streamPtr->end - endIndex; streamPtr->dictLimit = endIndex - (U32)dictSize; streamPtr->lowLimit = endIndex - (U32)dictSize; - if (streamPtr->nextToUpdate < streamPtr->dictLimit) streamPtr->nextToUpdate = streamPtr->dictLimit; + if (streamPtr->nextToUpdate < streamPtr->dictLimit) + streamPtr->nextToUpdate = streamPtr->dictLimit; } return dictSize; } |