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

Bug fixes and refactors for Arbitrary impl

Browse source
This commit is contained in:
Chris Hennick 2023-05-27 17:04:27 -07:00
parent 3414e0d6fb
commit f46a0055ad
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/write.rs
View file

@ -167,15 +167,26 @@ impl arbitrary::Arbitrary<'_> for FileOptions {
#[cfg(feature = "deflate-zopfli")] #[cfg(feature = "deflate-zopfli")]
zopfli_buffer_size: None, zopfli_buffer_size: None,
}; };
if options.compression_method == Deflated { match options.compression_method {
options.compression_level = Some(u.int_in_range(0..=265)?); Deflated => {
if options.compression_level > Compression::best().level() { if bool::arbitrary(u)? {
options.zopfli_buffer_size = Some(1 << u.int_in_range(9..=30)?); let level = u.int_in_range(0..=265)?;
options.compression_level = Some(level);
if level > Compression::best().level() {
options.zopfli_buffer_size = Some(1 << u.int_in_range(9..=30)?);
}
}
},
Stored => {
if bool::arbitrary(u)? {
options.compression_level = Some(1);
}
},
_ => {
if bool::arbitrary(u)? {
options.compression_level = Some(u.int_in_range(0..=10)?);
}
} }
} 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