AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #89 from drcrallen/descriptiveFrameErrors

Browse Source 
Add more descriptive frame errors
This commit is contained in:
Yann Collet 2015-04-14 20:21:40 +02:00
commit 0dc8308f4c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/lz4frame.c
View File

@ -861,16 +861,16 @@ static size_t LZ4F_decodeHeader(LZ4F_dctx_internal_t* dctxPtr, const void* srcVo
blockSizeID = (BD>>4) & _3BITS; blockSizeID = (BD>>4) & _3BITS;
/* validate */ /* validate */
if (version != 1) return (size_t)-ERROR_GENERIC; /* Version Number, only supported value */ if (version != 1) return (size_t)-ERROR_version_wrong; /* Version Number, only supported value */
if (blockChecksumFlag != 0) return (size_t)-ERROR_GENERIC; /* Only supported value for the time being */ if (blockChecksumFlag != 0) return (size_t)-ERROR_unsupported_checksum; /* Only supported value for the time being */
if (((FLG>>0)&_2BITS) != 0) return (size_t)-ERROR_GENERIC; /* Reserved bits */ if (((FLG>>0)&_2BITS) != 0) return (size_t)-ERROR_reserved_flag_set; /* Reserved bits */
if (((BD>>7)&_1BIT) != 0) return (size_t)-ERROR_GENERIC; /* Reserved bit */ if (((BD>>7)&_1BIT) != 0) return (size_t)-ERROR_reserved_flag_set; /* Reserved bit */
if (blockSizeID < 4) return (size_t)-ERROR_GENERIC; /* 4-7 only supported values for the time being */ if (blockSizeID < 4) return (size_t)-ERROR_unsupported_block_size; /* 4-7 only supported values for the time being */
if (((BD>>0)&_4BITS) != 0) return (size_t)-ERROR_GENERIC; /* Reserved bits */ if (((BD>>0)&_4BITS) != 0) return (size_t)-ERROR_reserved_flag_set; /* Reserved bits */
/* check */ /* check */
HC = LZ4F_headerChecksum(srcPtr+4, frameHeaderSize-5); HC = LZ4F_headerChecksum(srcPtr+4, frameHeaderSize-5);
if (HC != srcPtr[frameHeaderSize-1]) return (size_t)-ERROR_GENERIC; /* Bad header checksum error */ if (HC != srcPtr[frameHeaderSize-1]) return (size_t)-ERROR_header_checksum_invalid; /* Bad header checksum error */
/* save */ /* save */
dctxPtr->frameInfo.blockMode = (blockMode_t)blockMode; dctxPtr->frameInfo.blockMode = (blockMode_t)blockMode;

5
lib/lz4frame_static.h
View File

@ -57,6 +57,11 @@ extern "C" {
ITEM(ERROR_wrongSrcPtr) \ ITEM(ERROR_wrongSrcPtr) \
ITEM(ERROR_decompressionFailed) \ ITEM(ERROR_decompressionFailed) \
ITEM(ERROR_checksum_invalid) \ ITEM(ERROR_checksum_invalid) \
ITEM(ERROR_version_wrong) \
ITEM(ERROR_unsupported_checksum) \
ITEM(ERROR_reserved_flag_set) \
ITEM(ERROR_unsupported_block_size) \
ITEM(ERROR_header_checksum_invalid) \
ITEM(ERROR_maxCode) ITEM(ERROR_maxCode)
#define LZ4F_GENERATE_ENUM(ENUM) ENUM, #define LZ4F_GENERATE_ENUM(ENUM) ENUM,