diff options
Diffstat (limited to 'src/liblzma/common/block_decoder.c')
| -rw-r--r-- | src/liblzma/common/block_decoder.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/liblzma/common/block_decoder.c b/src/liblzma/common/block_decoder.c index 9b998e63..a3ce6f49 100644 --- a/src/liblzma/common/block_decoder.c +++ b/src/liblzma/common/block_decoder.c @@ -146,26 +146,22 @@ block_decode(lzma_coder *coder, lzma_allocator *allocator, // Fall through case SEQ_CHECK: { - const bool chksup = lzma_check_is_supported( - coder->block->check); - - while (*in_pos < in_size) { - // coder->check.buffer[] may be uninitialized when - // the Check ID is not supported. - if (chksup && coder->check.buffer.u8[coder->check_pos] - != in[*in_pos]) { - ++*in_pos; - return LZMA_DATA_ERROR; - } - - ++*in_pos; - - if (++coder->check_pos == lzma_check_size( - coder->block->check)) - return LZMA_STREAM_END; - } + const size_t check_size = lzma_check_size(coder->block->check); + lzma_bufcpy(in, in_pos, in_size, coder->block->raw_check, + &coder->check_pos, check_size); + if (coder->check_pos < check_size) + return LZMA_OK; + + // Validate the Check only if we support it. + // coder->check.buffer may be uninitialized + // when the Check ID is not supported. + if (lzma_check_is_supported(coder->block->check) + && memcmp(coder->block->raw_check, + coder->check.buffer.u8, + check_size) != 0) + return LZMA_DATA_ERROR; - return LZMA_OK; + return LZMA_STREAM_END; } } |