fix(exif): #19 freeze when checking broken file

mindeng · Nov 18, 2024 · 1c3bc2a · 1c3bc2a
1 parent 1f5b02f
commit 1c3bc2a
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/exif/exif_iter.rs b/src/exif/exif_iter.rs
@@ -378,6 +378,14 @@ impl Iterator for ExifIter {
 
                     match entry {
                         IfdEntry::IfdNew(new_ifd) => {
+                            if new_ifd.offset <= ifd.offset {
+                                tracing::debug!(
+                                    ?tag_code,
+                                    ?new_ifd,
+                                    "bad new SUB-IFD: offset is smaller than current IFD"
+                                );
+                                continue;
+                            }
                             let is_subifd = if new_ifd.ifd_idx == ifd.ifd_idx {
                                 // Push the current ifd before enter sub-ifd.
                                 self.ifds.push(ifd);