diff --git a/crates/image-codecs/src/codecs/jpeg.rs b/crates/image-codecs/src/codecs/jpeg.rs index 23545bcb3..c2d178a9d 100644 --- a/crates/image-codecs/src/codecs/jpeg.rs +++ b/crates/image-codecs/src/codecs/jpeg.rs @@ -820,11 +820,29 @@ mod tests { #[test] fn lossless_and_twelve_bit_progressive_are_unsupported_not_damaged() { for marker in [0xC3, 0xC2] { - let mut bytes = vec![0xFF, 0xD8, 0xFF, marker, 0, 11, 12, 0, 8, 0, 8, 1, 1, 0x11, 0]; - // A progressive frame's first scan is a DC scan (Ss=Se=0); a - // sequential frame uses the full spectral range (Ss=0, Se=63). - let spectral_end = if marker == 0xC2 { 0 } else { 0x3F }; - bytes.extend_from_slice(&[0xFF, 0xDA, 0, 8, 1, 1, 0, 0, spectral_end, 0, 0x12, 0x34, 0xFF, 0xD9]); + let bytes = if marker == 0xC2 { + // Use a valid progressive DC scan so this exercises unsupported + // precision rather than failing on missing tables or scan syntax. + let mut bytes = vec![0xFF, 0xD8]; + let mut dqt = vec![0]; + dqt.extend([1u8; 64]); + segment(&mut bytes, 0xDB, &dqt); + segment(&mut bytes, marker, &[12, 0, 8, 0, 8, 1, 1, 0x11, 0]); + let mut dht = vec![0x00, 1]; + dht.extend([0u8; 15]); + dht.push(0); + dht.extend([0x10, 1]); + dht.extend([0u8; 15]); + dht.push(0); + segment(&mut bytes, 0xC4, &dht); + segment(&mut bytes, 0xDA, &[1, 1, 0, 0, 0, 0]); + bytes.extend([0x7F, 0xFF, 0xD9]); + bytes + } else { + let mut bytes = vec![0xFF, 0xD8, 0xFF, marker, 0, 11, 12, 0, 8, 0, 8, 1, 1, 0x11, 0]; + bytes.extend_from_slice(&[0xFF, 0xDA, 0, 8, 1, 1, 0, 0, 0x3F, 0, 0x12, 0x34, 0xFF, 0xD9]); + bytes + }; let e = crate::decode(&bytes).unwrap_err(); assert!(matches!(e, CodecError::Unsupported { .. }), "{marker:#x}: {e:?}"); }