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

Refactor: fuzz with a compression level that matches the method or is just past the edge

Browse source
This commit is contained in:
Chris Hennick 2023-05-27 16:55:21 -07:00
parent 543f469277
commit 7e6472c761
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/write.rs
View file

@ -156,7 +156,7 @@ impl arbitrary::Arbitrary<'_> for FileOptions {
fn arbitrary(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Self> { fn arbitrary(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Self> {
let mut options = FileOptions { let mut options = FileOptions {
compression_method: CompressionMethod::arbitrary(u)?, compression_method: CompressionMethod::arbitrary(u)?,
compression_level: Option::<i32>::arbitrary(u)?, compression_level: None,
last_modified_time: DateTime::arbitrary(u)?, last_modified_time: DateTime::arbitrary(u)?,
permissions: Option::<u32>::arbitrary(u)?, permissions: Option::<u32>::arbitrary(u)?,
large_file: bool::arbitrary(u)?, large_file: bool::arbitrary(u)?,
@ -167,10 +167,15 @@ impl arbitrary::Arbitrary<'_> for FileOptions {
#[cfg(feature = "deflate-zopfli")] #[cfg(feature = "deflate-zopfli")]
zopfli_buffer_size: None, zopfli_buffer_size: None,
}; };
#[cfg(feature = "deflate-zopfli")] if options.compression_method == Deflated {
if options.compression_method == Deflated options.compression_level = Some(u.int_in_range(0..=265)?);
&& options.compression_level > Compression::best().level() { if options.compression_level > Compression::best().level() {
options.zopfli_buffer_size = Some(1 << u.int_in_range(10..=30)?); options.zopfli_buffer_size = Some(1 << u.int_in_range(9..=30)?);
}
} else if options.compression_method != Stored {
options.compression_level = Some(u.int_in_range(0..=10)?);
} else if bool::arbitrary(u) {
options.compression_level = Some(1);
} }
u.arbitrary_loop(Some(0), Some((u16::MAX / 4) as u32), |u| { u.arbitrary_loop(Some(0), Some((u16::MAX / 4) as u32), |u| {
options options