fix(exif): #20 Panic depth shouldn't be greater than 1

mindeng · Nov 18, 2024 · 02fc32c · 02fc32c
1 parent 1c3bc2a
commit 02fc32c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/exif/exif_iter.rs b/src/exif/exif_iter.rs
@@ -379,7 +379,7 @@ impl Iterator for ExifIter {
                     match entry {
                         IfdEntry::IfdNew(new_ifd) => {
                             if new_ifd.offset <= ifd.offset {
-                                tracing::debug!(
+                                tracing::error!(
                                     ?tag_code,
                                     ?new_ifd,
                                     "bad new SUB-IFD: offset is smaller than current IFD"

diff --git a/src/exif/travel.rs b/src/exif/travel.rs
@@ -141,11 +141,9 @@ impl<'a> IfdHeaderTravel<'a> {
 
     #[tracing::instrument(skip(self))]
     pub fn travel_ifd(&mut self, depth: usize) -> Result<(), ParsingError> {
-        // Currently, we ignore ifd1 data in *.tif files
-        if depth > 1 {
-            let msg = "depth shouldn't be greater than 1";
+        if depth >= 3 {
+            let msg = "depth shouldn't be greater than 3";
             tracing::error!(msg);
-            debug_assert!(false, "{}", msg);
             return Err(ParsingError::Failed(msg.into()));
         }
 
@@ -161,15 +159,23 @@ impl<'a> IfdHeaderTravel<'a> {
             pos += IFD_ENTRY_SIZE;
 
             if let Some(ifd) = sub_ifd {
-                sub_ifds.push(ifd);
+                if ifd.offset <= self.offset {
+                    tracing::error!(
+                        current_ifd_offset = self.offset,
+                        subifd_offset = ifd.offset,
+                        "bad new SUB-IFD in TIFF: offset is smaller than current IFD"
+                    );
+                } else {
+                    sub_ifds.push(ifd);
+                }
             }
         }
 
         for mut ifd in sub_ifds {
             ifd.travel_ifd(depth + 1)?;
         }
 
-        // ignore ifd1 in TIFF
+        // Currently, we ignore ifd1 data in *.tif files
         Ok(())
     }
 }