DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set a minimum size for non-repeating chunks

Browse source
This commit is contained in:
Chris Hennick 2023-05-01 15:08:20 -07:00
parent 09d1ef2e3b
commit bc14c1ef5e
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -16,7 +16,10 @@ const LARGE_FILE_BUF_SIZE: usize = u32::MAX as usize + 1;
#[derive(Arbitrary, Clone, Debug)] #[derive(Arbitrary, Clone, Debug)]
pub enum RepeatedBytes { pub enum RepeatedBytes {
Once(Vec<u8>), Once {
min_bytes: [u8; 1024],
extra_bytes: Vec<u8>
},
U8Times { U8Times {
bytes: Vec<u8>, bytes: Vec<u8>,
repeats: u8, repeats: u8,
@ -32,7 +35,9 @@ impl IntoIterator for RepeatedBytes {
type IntoIter = Flatten<Take<Repeat<Vec<u8>>>>; type IntoIter = Flatten<Take<Repeat<Vec<u8>>>>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
match self { match self {
RepeatedBytes::Once(bytes) => { RepeatedBytes::Once {min_bytes, extra_bytes} => {
let mut bytes = min_bytes.to_vec();
bytes.extend(extra_bytes);
repeat(bytes).take(1) repeat(bytes).take(1)
}, },
RepeatedBytes::U8Times {bytes, repeats} => { RepeatedBytes::U8Times {bytes, repeats} => {
@ -102,7 +107,7 @@ fn do_operation<T>(writer: &mut zip_next::ZipWriter<T>,
let written: usize = 0; let written: usize = 0;
while written < LARGE_FILE_BUF_SIZE { while written < LARGE_FILE_BUF_SIZE {
for chunk in &file.large_contents { for chunk in &file.large_contents {
let chunk: Vec<u8> = chunk.iter() let chunk: Vec<u8> = chunk.to_owned().into_iter()
.flat_map(RepeatedBytes::into_iter) .flat_map(RepeatedBytes::into_iter)
.collect(); .collect();
writer.write_all(chunk.as_slice())?; writer.write_all(chunk.as_slice())?;