mkv: report decode error on invalid vint width

pdeljanov · Jan 4, 2025 · 0bd41f4 · 0bd41f4
1 parent 8534bcb
commit 0bd41f4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/symphonia-format-mkv/src/ebml.rs b/symphonia-format-mkv/src/ebml.rs
@@ -87,6 +87,9 @@ fn read_vint<R: ReadBytes>(mut reader: R) -> Result<(u64, u32)> {
     }
 
     let vint_width = byte.leading_zeros();
+    if vint_width == 8 {
+        return decode_error("mkv: vint width must less than 8 bits");
+    }
     let mut vint = u64::from(byte);
     // Clear VINT_MARKER bit
     vint ^= 1 << (7 - vint_width);
@@ -119,6 +122,7 @@ mod tests {
 
     #[test]
     fn variable_unsigned_integer_parsing() {
+        assert!(read_unsigned_vint(BufReader::new(&[0x0])).is_err());
         assert_eq!(read_unsigned_vint(BufReader::new(&[0x82])).unwrap(), 2);
         assert_eq!(read_unsigned_vint(BufReader::new(&[0x40, 0x02])).unwrap(), 2);
         assert_eq!(read_unsigned_vint(BufReader::new(&[0x20, 0x00, 0x02])).unwrap(), 2);