fix(audio): reject overflowing interleaved ADPCM layouts

This commit is contained in:
Dylan M. Taylor committed 2026-11-17 08:47:42 -05:00
1 parent 46587441df
commit cec152da82
2 files changed
+28 -2

No files matched your search

+15 -1
View File
@@ -71,7 +71,13 @@ pub fn samples_per_block(block_align: usize, channels: usize) -> Option<usize> {
}
let header = 4 * channels;
let body = block_align.checked_sub(header)?;
if body > 0 && body.is_multiple_of(4 * channels) { (body / channels).checked_mul(2)?.checked_add(1) } else { None }
if body == 0 || !body.is_multiple_of(4 * channels) {
return None;
}
let per = (body / channels).checked_mul(2)?.checked_add(1)?;
// Callers size interleaved buffers from this value; the full count must fit too.
per.checked_mul(channels)?;
Some(per)
}
/// Decode one block, appending its samples interleaved by channel to `out`.
@@ -223,6 +229,14 @@ mod tests {
assert_eq!(samples_per_block(258, 2), None);
}
#[test]
fn unrepresentable_interleaved_layout_is_rejected() {
let align = usize::MAX - 7;
assert_eq!(samples_per_block(align, 2), None);
assert!(encode(&[], 2, align).is_err());
assert!(encode_block(&[], 2, align).is_err());
}
#[test]
fn silence_stays_silent() {
let block = encode_block(&vec![0; 505], 1, 256).unwrap();
+13 -1
View File
@@ -61,7 +61,10 @@ pub fn samples_per_block(block_align: usize, channels: usize) -> Option<usize> {
}
let body = block_align.checked_sub(7 * channels).filter(|&b| b > 0)?;
// codes pair up across channels
body.checked_mul(2).map(|b| b / channels + 2)
let per = (body.checked_mul(2)? / channels).checked_add(2)?;
// Include the header samples and all channels before callers size their buffers.
per.checked_mul(channels)?;
Some(per)
}
/// Decode one block, appending its samples interleaved by channel to `out`.
@@ -210,6 +213,15 @@ mod tests {
assert_eq!(samples_per_block(100, 3), None);
}
#[test]
fn unrepresentable_layouts_are_rejected() {
for (align, channels) in [(usize::MAX / 2 + 7, 1), (usize::MAX / 2 + 14, 2)] {
assert_eq!(samples_per_block(align, channels), None);
assert!(encode(&[], channels, align).is_err());
assert!(encode_block(&[], channels, align).is_err());
}
}
#[test]
fn a_long_run_of_large_codes_cannot_overflow() {
// a step that starts at its largest 16-bit value and grows with every large code