Skip to content

Commit

Permalink
We are missing 4 bytes in the LZ4 compression buffer. (#1226)
Browse files Browse the repository at this point in the history
Closes #831
  • Loading branch information
fulmicoton committed Dec 2, 2021
1 parent 1d4e9a2 commit 03c2f6e
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/store/compression_lz4_block.rs
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
use std::io::{self};

use core::convert::TryInto;
use std::mem;
use lz4_flex::{compress_into, decompress_into};

#[inline]
#[allow(clippy::uninit_vec)]
pub fn compress(uncompressed: &[u8], compressed: &mut Vec<u8>) -> io::Result<()> {
compressed.clear();
let maximum_ouput_size = lz4_flex::block::get_maximum_output_size(uncompressed.len());
let maximum_ouput_size = mem::size_of::<u32>() + lz4_flex::block::get_maximum_output_size(uncompressed.len());
compressed.reserve(maximum_ouput_size);

unsafe {
compressed.set_len(maximum_ouput_size + 4);
compressed.set_len(maximum_ouput_size);
}
let bytes_written = compress_into(uncompressed, &mut compressed[4..])
.map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err.to_string()))?;
let num_bytes = uncompressed.len() as u32;
compressed[0..4].copy_from_slice(&num_bytes.to_le_bytes());
unsafe {
compressed.set_len(bytes_written + 4);
compressed.set_len(bytes_written + mem::size_of::<u32>());
}
Ok(())
}

#[inline]
#[allow(clippy::uninit_vec)]
pub fn decompress(compressed: &[u8], decompressed: &mut Vec<u8>) -> io::Result<()> {
decompressed.clear();
let uncompressed_size_bytes: &[u8; 4] = compressed
Expand Down

0 comments on commit 03c2f6e

Please sign in to comment.