Merge pull request #403 from kinetiknz/partial_revert_eof_handling

Move UnexpectedEOF handling back to the BoxIter.

Author: padenot

mp4parse/src/lib.rs

@@ -2273,11 +2273,11 @@ impl<'a, T: Read> BoxIter<'a, T> {
     fn next_box(&mut self) -> Result<Option<BMFFBox<T>>> {
         let r = read_box_header(self.src);
         match r {
-            Ok(Some(h)) => Ok(Some(BMFFBox {
+            Ok(h) => Ok(Some(BMFFBox {
                 head: h,
                 content: self.src.take(h.size.saturating_sub(h.offset)),
             })),
-            Ok(None) => Ok(None),
+            Err(Error::UnexpectedEOF) => Ok(None),
             Err(e) => Err(e),
         }
     }
@@ -2332,10 +2332,9 @@ impl<'a, T> Drop for BMFFBox<'a, T> {
 /// skip unknown or uninteresting boxes.
 ///
 /// See ISOBMFF (ISO 14496-12:2020) § 4.2
-fn read_box_header<T: ReadBytesExt>(src: &mut T) -> Result<Option<BoxHeader>> {
+fn read_box_header<T: ReadBytesExt>(src: &mut T) -> Result<BoxHeader> {
     let size32 = match be_u32(src) {
         Ok(v) => v,
-        Err(Error::UnexpectedEOF) => return Ok(None),
         Err(error) => return Err(error),
     };
     let name = BoxType::from(be_u32(src)?);
@@ -2379,12 +2378,12 @@ fn read_box_header<T: ReadBytesExt>(src: &mut T) -> Result<Option<BoxHeader>> {
         _ if offset > size => return Err(Error::from(Status::BoxBadSize)),
         _ => (),
     }
-    Ok(Some(BoxHeader {
+    Ok(BoxHeader {
         name,
         size,
         offset,
         uuid,
-    }))
+    })
 }
 
 /// Parse the extra header fields for a full box.

mp4parse/src/tests.rs

@@ -93,7 +93,7 @@ where
 #[test]
 fn read_box_header_short() {
     let mut stream = make_box(BoxSize::Short(8), b"test", |s| s);
-    let header = super::read_box_header(&mut stream).unwrap().unwrap();
+    let header = super::read_box_header(&mut stream).unwrap();
     assert_eq!(header.name, BoxType::UnknownBox(0x7465_7374)); // "test"
     assert_eq!(header.size, 8);
     assert!(header.uuid.is_none());
@@ -102,7 +102,7 @@ fn read_box_header_short() {
 #[test]
 fn read_box_header_long() {
     let mut stream = make_box(BoxSize::Long(16), b"test", |s| s);
-    let header = super::read_box_header(&mut stream).unwrap().unwrap();
+    let header = super::read_box_header(&mut stream).unwrap();
     assert_eq!(header.name, BoxType::UnknownBox(0x7465_7374)); // "test"
     assert_eq!(header.size, 16);
     assert!(header.uuid.is_none());
@@ -177,9 +177,9 @@ fn read_box_header_uuid_past_eof() {
     let mut cursor = Cursor::new(HEADER_UUID);
     let mut iter = super::BoxIter::new(&mut cursor);
     match iter.next_box() {
-        Err(Error::UnexpectedEOF) => (),
-        Ok(_) => panic!("expected an error result"),
-        _ => panic!("expected a different error result"),
+        Ok(None) => (),
+        Ok(_) => panic!("unexpected box read"),
+        _ => panic!("unexpected error"),
     };
 }
 

mp4parse/tests/public.rs

@@ -1294,7 +1294,7 @@ fn public_avif_valid_with_garbage_overread_at_end() {
 
 #[test]
 fn public_avif_valid_with_garbage_byte_at_end() {
-    assert_avif_should(IMAGE_AVIF_VALID_WITH_GARBAGE_BYTE_AT_END, Status::Eof);
+    assert_avif_should(IMAGE_AVIF_VALID_WITH_GARBAGE_BYTE_AT_END, Status::Ok);
 }
 
 #[test]