From cec152da825aa50633b0ce69f29120eca93fdd8f Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Tue, 17 Nov 2026 08:47:42 -0500 Subject: [PATCH] fix(audio): reject overflowing interleaved ADPCM layouts --- crates/audio/src/adpcm/ima.rs | 16 +++++++++++++++- crates/audio/src/adpcm/ms.rs | 14 +++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/crates/audio/src/adpcm/ima.rs b/crates/audio/src/adpcm/ima.rs index facaa4c81..dcf6958f7 100644 --- a/crates/audio/src/adpcm/ima.rs +++ b/crates/audio/src/adpcm/ima.rs @@ -71,7 +71,13 @@ pub fn samples_per_block(block_align: usize, channels: usize) -> Option { } 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(); diff --git a/crates/audio/src/adpcm/ms.rs b/crates/audio/src/adpcm/ms.rs index 9952d11b6..057f93549 100644 --- a/crates/audio/src/adpcm/ms.rs +++ b/crates/audio/src/adpcm/ms.rs @@ -61,7 +61,10 @@ pub fn samples_per_block(block_align: usize, channels: usize) -> Option { } 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