Check identical IFD offsets. Fixes #80

oozcitak · Dec 1, 2020 · 227e86b · 227e86b
1 parent 124304d
commit 227e86b
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/ExifLibrary/JPEGFile.cs b/ExifLibrary/JPEGFile.cs
@@ -611,17 +611,38 @@ private void ReadExifAPP1()
                     if (currentifd == IFD.Zeroth && tag == 0x8769)
                     {
                         int exififdpointer = (int)conv.ToUInt32(value, 0);
-                        ifdqueue.Add(exififdpointer, IFD.EXIF);
+                        if (ifdqueue.ContainsKey(exififdpointer))
+                        {
+                            Errors.Add(new ImageError(Severity.Warning, "IFD queue already contains an Exif IFD pointer."));
+                        }
+                        else
+                        {
+                            ifdqueue.Add(exififdpointer, IFD.EXIF);
+                        }
                     }
                     else if (currentifd == IFD.Zeroth && tag == 0x8825)
                     {
                         int gpsifdpointer = (int)conv.ToUInt32(value, 0);
-                        ifdqueue.Add(gpsifdpointer, IFD.GPS);
+                        if (ifdqueue.ContainsKey(gpsifdpointer))
+                        {
+                            Errors.Add(new ImageError(Severity.Warning, "IFD queue already contains a GPS IFD pointer."));
+                        }
+                        else
+                        {
+                            ifdqueue.Add(gpsifdpointer, IFD.GPS);
+                        }
                     }
                     else if (currentifd == IFD.EXIF && tag == 0xa005)
                     {
                         int interopifdpointer = (int)conv.ToUInt32(value, 0);
-                        ifdqueue.Add(interopifdpointer, IFD.Interop);
+                        if (ifdqueue.ContainsKey(interopifdpointer))
+                        {
+                            Errors.Add(new ImageError(Severity.Warning, "IFD queue already contains an Interop IFD pointer."));
+                        }
+                        else
+                        {
+                            ifdqueue.Add(interopifdpointer, IFD.Interop);
+                        }
                     }
 
                     // Save the offset to maker note data