diff --git a/src/expand_block_v1.c b/src/expand_block_v1.c index e3fca96..1a336c1 100644 --- a/src/expand_block_v1.c +++ b/src/expand_block_v1.c @@ -177,6 +177,8 @@ int lzsa_decompressor_expand_block_v1(const unsigned char *pInBlock, int nBlockS if (nMatchLen == (MATCH_RUN_LEN_V1 + MIN_MATCH_SIZE_V1)) { if (lzsa_build_match_len_v1(&pInBlock, pInBlockEnd, &nMatchLen)) return -1; + if (nMatchLen == 0) + break; } if ((pCurOutData + nMatchLen) <= pOutDataEnd) { diff --git a/src/expand_block_v2.c b/src/expand_block_v2.c index 05cfd92..042a2e8 100644 --- a/src/expand_block_v2.c +++ b/src/expand_block_v2.c @@ -80,6 +80,9 @@ static inline FORCE_INLINE int lzsa_build_len_v2(const unsigned char **ppInBlock return -1; } } + else if ((*nLength) == 256) { + (*nLength) = 0; + } } else { return -1; @@ -202,6 +205,8 @@ int lzsa_decompressor_expand_block_v2(const unsigned char *pInBlock, int nBlockS if (nMatchLen == (MATCH_RUN_LEN_V2 + MIN_MATCH_SIZE_V2)) { if (lzsa_build_len_v2(&pInBlock, pInBlockEnd, &nCurNibbles, &nibbles, &nMatchLen)) return -1; + if (nMatchLen == 0) + break; } if ((pCurOutData + nMatchLen) <= pOutDataEnd) { diff --git a/src/expand_inmem.c b/src/expand_inmem.c index c3fd715..501ec37 100644 --- a/src/expand_inmem.c +++ b/src/expand_inmem.c @@ -107,8 +107,7 @@ size_t lzsa_decompress_inmem(const unsigned char *pFileData, unsigned char *pOut const int nHeaderSize = lzsa_get_header_size(); if (nFlags & LZSA_FLAG_RAW_BLOCK) { - int nEODBytes = (*pFormatVersion == 2) ? 2 : 4; - return (size_t)lzsa_decompressor_expand_block(pFileData, (int)nFileSize - nEODBytes /* EOD marker */, pOutBuffer, 0, (int)nMaxOutBufferSize, *pFormatVersion); + return (size_t)lzsa_decompressor_expand_block(pFileData, (int)nFileSize, pOutBuffer, 0, (int)nMaxOutBufferSize, *pFormatVersion); } /* Check header */ diff --git a/src/expand_streaming.c b/src/expand_streaming.c index 215c265..d981778 100644 --- a/src/expand_streaming.c +++ b/src/expand_streaming.c @@ -185,11 +185,6 @@ lzsa_status_t lzsa_decompress_stream(lzsa_stream_t *pInStream, lzsa_stream_t *pO } size_t nReadBytes = pInStream->read(pInStream, pInBlock, nBlockSize); if (nFlags & LZSA_FLAG_RAW_BLOCK) { - size_t nEODBytes = (nFormatVersion == 2) ? 2 : 4; - if (nReadBytes > nEODBytes) - nReadBytes -= nEODBytes; - else - nReadBytes = 0; nBlockSize = (unsigned int)nReadBytes; } diff --git a/src/lzsa.c b/src/lzsa.c index 2b6c40d..ebdcefb 100755 --- a/src/lzsa.c +++ b/src/lzsa.c @@ -1005,8 +1005,8 @@ int main(int argc, char **argv) { fprintf(stderr, "usage: %s [-c] [-d] [-v] [-r] \n", argv[0]); fprintf(stderr, " -c: check resulting stream after compressing\n"); fprintf(stderr, " -d: decompress (default: compress)\n"); - fprintf(stderr, " -cbench: benchmary in-memory compression\n"); - fprintf(stderr, " -dbench: benchmary in-memory decompression\n"); + fprintf(stderr, " -cbench: benchmark in-memory compression\n"); + fprintf(stderr, " -dbench: benchmark in-memory decompression\n"); fprintf(stderr, " -test: run automated self-tests\n"); fprintf(stderr, " -v: be verbose\n"); fprintf(stderr, " -f : LZSA compression format (1-2)\n"); diff --git a/src/shrink_block_v1.c b/src/shrink_block_v1.c index 6fae63d..f22e7ec 100644 --- a/src/shrink_block_v1.c +++ b/src/shrink_block_v1.c @@ -482,8 +482,8 @@ static int lzsa_write_raw_uncompressed_block_v1(lzsa_compressor *pCompressor, co * * @param pCompressor compression context * @param pInWindow pointer to input data window (previously compressed bytes + bytes to compress) - * @param nStartOffset current offset in input window (typically the number of previously compressed bytes) - * @param nEndOffset offset to end finding matches at (typically the size of the total input window in bytes + * @param nPreviousBlockSize number of previously compressed bytes (or 0 for none) + * @param nInDataSize number of input bytes to compress * @param pOutData pointer to output buffer * @param nMaxOutDataSize maximum size of output buffer, in bytes * diff --git a/src/shrink_block_v1.h b/src/shrink_block_v1.h index bacb43a..70a0289 100644 --- a/src/shrink_block_v1.h +++ b/src/shrink_block_v1.h @@ -41,13 +41,13 @@ typedef struct _lzsa_compressor lzsa_compressor; * * @param pCompressor compression context * @param pInWindow pointer to input data window (previously compressed bytes + bytes to compress) - * @param nStartOffset current offset in input window (typically the number of previously compressed bytes) - * @param nEndOffset offset to end finding matches at (typically the size of the total input window in bytes + * @param nPreviousBlockSize number of previously compressed bytes (or 0 for none) + * @param nInDataSize number of input bytes to compress * @param pOutData pointer to output buffer * @param nMaxOutDataSize maximum size of output buffer, in bytes * * @return size of compressed data in output buffer, or -1 if the data is uncompressible */ -int lzsa_optimize_and_write_block_v1(lzsa_compressor *pCompressor, const unsigned char *pInWindow, const int nStartOffset, const int nEndOffset, unsigned char *pOutData, const int nMaxOutDataSize); +int lzsa_optimize_and_write_block_v1(lzsa_compressor *pCompressor, const unsigned char *pInWindow, const int nPreviousBlockSize, const int nInDataSize, unsigned char *pOutData, const int nMaxOutDataSize); #endif /* _SHRINK_BLOCK_V1_H */ diff --git a/src/shrink_block_v2.c b/src/shrink_block_v2.c index 29a7983..d98ccb3 100644 --- a/src/shrink_block_v2.c +++ b/src/shrink_block_v2.c @@ -1035,8 +1035,8 @@ static int lzsa_write_raw_uncompressed_block_v2(lzsa_compressor *pCompressor, co * * @param pCompressor compression context * @param pInWindow pointer to input data window (previously compressed bytes + bytes to compress) - * @param nStartOffset current offset in input window (typically the number of previously compressed bytes) - * @param nEndOffset offset to end finding matches at (typically the size of the total input window in bytes + * @param nPreviousBlockSize number of previously compressed bytes (or 0 for none) + * @param nInDataSize number of input bytes to compress * @param pOutData pointer to output buffer * @param nMaxOutDataSize maximum size of output buffer, in bytes * diff --git a/src/shrink_block_v2.h b/src/shrink_block_v2.h index 6956199..7db1da7 100644 --- a/src/shrink_block_v2.h +++ b/src/shrink_block_v2.h @@ -41,13 +41,13 @@ typedef struct _lzsa_compressor lzsa_compressor; * * @param pCompressor compression context * @param pInWindow pointer to input data window (previously compressed bytes + bytes to compress) - * @param nStartOffset current offset in input window (typically the number of previously compressed bytes) - * @param nEndOffset offset to end finding matches at (typically the size of the total input window in bytes + * @param nPreviousBlockSize number of previously compressed bytes (or 0 for none) + * @param nInDataSize number of input bytes to compress * @param pOutData pointer to output buffer * @param nMaxOutDataSize maximum size of output buffer, in bytes * * @return size of compressed data in output buffer, or -1 if the data is uncompressible */ -int lzsa_optimize_and_write_block_v2(lzsa_compressor *pCompressor, const unsigned char *pInWindow, const int nStartOffset, const int nEndOffset, unsigned char *pOutData, const int nMaxOutDataSize); +int lzsa_optimize_and_write_block_v2(lzsa_compressor *pCompressor, const unsigned char *pInWindow, const int nPreviousBlockSize, const int nInDataSize, unsigned char *pOutData, const int nMaxOutDataSize); #endif /* _SHRINK_BLOCK_V2_H */