From: Joseph Sutton Date: Mon, 7 Mar 2022 07:09:40 +0000 (+1300) Subject: compression: Use correct value for indic_pos X-Git-Tag: talloc-2.3.4~174 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69244b52ed4faa047b4b4117da4d1f9c58ba11e7;p=thirdparty%2Fsamba.git compression: Use correct value for indic_pos Previously, we were setting this to the wrong value and overwriting existing output data. Signed-off-by: Joseph Sutton Reviewed-by: Douglas Bagnall --- diff --git a/lib/compression/lzxpress.c b/lib/compression/lzxpress.c index 0ecb6e23f93..d3195a49435 100644 --- a/lib/compression/lzxpress.c +++ b/lib/compression/lzxpress.c @@ -201,8 +201,8 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed, if (indic_bit == 32) { PUSH_LE_U32(indic_pos, 0, indic); indic_bit = 0; - indic_pos = &compressed[compressed_pos]; - compressed_pos += sizeof(uint32_t); + indic_pos = &compressed[compressed_pos + metadata_size]; + metadata_size += sizeof(uint32_t); } compressed_pos += metadata_size; diff --git a/selftest/knownfail.d/lzxpress b/selftest/knownfail.d/lzxpress index 0fe7fdba6e0..922401eaa03 100644 --- a/selftest/knownfail.d/lzxpress +++ b/selftest/knownfail.d/lzxpress @@ -1,2 +1 @@ -samba4.local.compression.lzxpress5 samba4.local.compression.lzxpress6