Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed error in compressing lz4raw with large offsets #140

Merged
merged 1 commit into from
May 15, 2022
+7 −7
Merged

Fixed error in compressing lz4raw with large offsets #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/compression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ pub fn compress(
CompressionOptions::Lz4Raw => {
let output_buf_len = output_buf.len();
let required_len = lz4::block::compress_bound(input_buf.len())?;
output_buf.resize(required_len, 0);
let size = lz4::block::compress_to_buffer(
output_buf.resize(output_buf_len + required_len, 0);
let compressed_size = lz4::block::compress_to_buffer(
input_buf,
None,
false,
&mut output_buf[output_buf_len..],
)?;
output_buf.truncate(output_buf_len + size);
output_buf.truncate(output_buf_len + compressed_size);
Ok(())
}
#[cfg(all(not(feature = "lz4"), not(feature = "lz4_flex")))]
Expand Down Expand Up @@ -207,14 +207,14 @@ mod tests {
use super::*;

fn test_roundtrip(c: CompressionOptions, data: &[u8]) {
let offset = 2;
let offset = 2048;

// Compress to a buffer that already has data is possible
let mut compressed = vec![2; offset];
compress(c, data, &mut compressed).expect("Error when compressing");

// data is compressed...
assert!(compressed.len() - 2 < data.len());
assert!(compressed.len() - offset < data.len());

let mut decompressed = vec![0; data.len()];
decompress(c.into(), &compressed[offset..], &mut decompressed)
Expand All @@ -223,7 +223,7 @@ mod tests {
}

fn test_codec(c: CompressionOptions) {
let sizes = vec![10000, 100000];
let sizes = vec![1000, 10000, 100000];
for size in sizes {
let data = (0..size).map(|x| (x % 255) as u8).collect::<Vec<_>>();
test_roundtrip(c, &data);
Expand Down Expand Up @@ -274,7 +274,7 @@ mod tests {
}

#[test]
fn test_codec_lz4() {
fn test_codec_lz4_raw() {
test_codec(CompressionOptions::Lz4Raw);
}

Expand Down