sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

compression: fix lzxpress decompress with trailing flags

Browse Source 
Every so often, lzxpress adds a 32-bit block of indicator flags to
help decode the next clump of 32 code words. A naive compressor (such
as we have) might do this at the very end for flags that aren't
actually used because there are no more bytes to decompress. If that
happens we need to stop processing, or we'll come to worse outcome at
the next CHECK_INPUT_BYTES.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2022-05-11 12:46:21 +12:00 committed by Andrew Bartlett
parent d8a90d2a8f
commit 1ca4449294
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/compression/lzxpress.c
View File

@ -236,6 +236,13 @@ ssize_t lzxpress_decompress(const uint8_t *input,
CHECK_INPUT_BYTES(sizeof(uint32_t));
indicator = PULL_LE_U32(input, input_index);
input_index += sizeof(uint32_t);
if (input_index == input_size) {
/*
* The compressor left room for indicator
* flags for data that doesn't exist.
*/
break;
}
indicator_bit = 32;
}
indicator_bit--;