compression: Use correct value for nibble_index

Previously, we were setting this to the wrong value and overwriting
existing output data.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/lib/compression/lzxpress.c b/lib/compression/lzxpress.c
index b38e57fa2aee06f72886b54a53c0d93729d2fdb0..0ecb6e23f931874ed3e285e49f497bdb865b6fd5 100644 (file)
--- a/lib/compression/lzxpress.c
+++ b/lib/compression/lzxpress.c
@@ -151,10 +151,10 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
                                match_len -= 7;
 
                                if (!nibble_index) {
-                                       nibble_index = compressed_pos;
+                                       nibble_index = compressed_pos + metadata_size;
 
                                        __CHECK_BYTES(max_compressed_size, compressed_pos + metadata_size, sizeof(uint8_t));
-                                       compressed[compressed_pos + metadata_size] = MIN(match_len, 15);
+                                       compressed[nibble_index] = MIN(match_len, 15);
                                        metadata_size += sizeof(uint8_t);
                                } else {
                                        __CHECK_BYTES(max_compressed_size, nibble_index, sizeof(uint8_t));

diff --git a/selftest/knownfail.d/lzxpress b/selftest/knownfail.d/lzxpress
index 3d75b222212aa63fad6f1fdc8c783186d969dab2..0fe7fdba6e0272e3cd9fe7061ab06ec1ba13fa51 100644 (file)
--- a/selftest/knownfail.d/lzxpress
+++ b/selftest/knownfail.d/lzxpress
@@ -1,3 +1,2 @@
-samba4.local.compression.lzxpress4
 samba4.local.compression.lzxpress5
 samba4.local.compression.lzxpress6