Merge pull request mozilla#241 from mozilla/bug-1661347

Return error if any of the primary item data is missing

Author: baumanj

mp4parse/src/lib.rs

@@ -1318,7 +1318,11 @@ pub fn read_avif<T: Read>(f: &mut T, context: &mut AvifContext) -> Result<()> {
 
     context.primary_item = primary_item_extents_data.concat()?;
 
-    Ok(())
+    if primary_item_extents_data.iter().any(TryVec::is_empty) {
+        Err(Error::InvalidData("Primary item data incomplete"))
+    } else {
+        Ok(())
+    }
 }
 
 /// Parse a metadata box in the context of an AVIF

mp4parse/tests/bug-1661347.avif

@@ -29,6 +29,7 @@ static VIDEO_EME_CBCS_MP4: &str = "tests/bipbop_cbcs_video_init.mp4";
 static VIDEO_AV1_MP4: &str = "tests/tiny_av1.mp4";
 static IMAGE_AVIF: &str = "av1-avif/testFiles/Microsoft/Monochrome.avif";
 static IMAGE_AVIF_CORRUPT: &str = "tests/bug-1655846.avif";
+static IMAGE_AVIF_CORRUPT_2: &str = "tests/bug-1661347.avif";
 static IMAGE_AVIF_GRID: &str = "av1-avif/testFiles/Microsoft/Summer_in_Tomsk_720p_5x4_grid.avif";
 static AVIF_TEST_DIR: &str = "av1-avif/testFiles";
 
@@ -635,6 +636,13 @@ fn public_avif_bug_1655846() {
     assert!(mp4::read_avif(input, context).is_err());
 }
 
+#[test]
+fn public_avif_bug_1661347() {
+    let context = &mut mp4::AvifContext::new();
+    let input = &mut File::open(IMAGE_AVIF_CORRUPT_2).expect("Unknown file");
+    assert!(mp4::read_avif(input, context).is_err());
+}
+
 #[test]
 #[ignore] // Remove when we add support; see https://github.com/mozilla/mp4parse-rust/issues/198
 fn public_avif_primary_item_is_grid() {