Mirrors/lofty-rs
2
0
Fork 0
mirror of https://github.com/Serial-ATA/lofty-rs synced 2024-12-12 05:32:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

WV: Add extra length check for wrong sized large blocks

Browse source
This commit is contained in:
Serial 2024-11-02 10:45:06 -04:00 committed by Alex
parent 7fa146b164
commit 440cae88c6
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lofty/src/wavpack/properties.rs
View file

@ -224,7 +224,7 @@ where
log::warn!("Unable to calculate duration, unknown sample counts are not yet supported");
return Ok(properties);
}
if total_samples == 0 || properties.sample_rate == 0 {
if parse_mode == ParsingMode::Strict {
decode_err!(@BAIL WavPack, "Unable to calculate duration (sample count == 0 || sample rate == 0)")
@ -317,6 +317,10 @@ fn get_extended_meta_info(
let is_large = id & ID_FLAG_LARGE_SIZE > 0;
if is_large {
if block_size - index < 2 {
break;
}
size += u32::from(block_content[index]) << 9;
size += u32::from(block_content[index + 1]) << 17;
index += 2;

BIN
lofty/tests/fuzz/assets/wavpackfile_read_from/crash-c6f0765886234e3a25b182f01bc3f92880188f5b_minimized Normal file
View file

Binary file not shown.

8
lofty/tests/fuzz/wavpackfile_read_from.rs
View file

@ -96,3 +96,11 @@ fn panic2() {
let mut reader = crate::get_reader("wavpackfile_read_from/bb");
let _ = WavPackFile::read_from(&mut reader, ParseOptions::default());
}
#[test_log::test]
fn panic3() {
let mut reader = crate::get_reader(
"wavpackfile_read_from/crash-c6f0765886234e3a25b182f01bc3f92880188f5b_minimized",
);
let _ = WavPackFile::read_from(&mut reader, ParseOptions::default());
}