enforce one id per MIFF image

ImageMagick · Mar 23, 2022 · 966a769 · 966a769
1 parent 000557d
commit 966a769
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/MagickCore/property.c b/MagickCore/property.c
@@ -2972,10 +2972,10 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             if (convex_hull[n].y < extreme.y)
               {
                 extreme=convex_hull[n];
-                continue; 
+                continue;
               }
             if (convex_hull[n].y != extreme.y)
-              continue; 
+              continue;
             if (convex_hull[n].x < extreme.x)
               extreme=convex_hull[n];
           }
@@ -2988,10 +2988,10 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             if (convex_hull[n].x > extreme.x)
               {
                 extreme=convex_hull[n];
-                continue; 
+                continue;
               }
             if (convex_hull[n].x != extreme.x)
-              continue; 
+              continue;
             if (convex_hull[n].y < extreme.y)
               extreme=convex_hull[n];
           }
@@ -3004,10 +3004,10 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             if (convex_hull[n].y > extreme.y)
               {
                 extreme=convex_hull[n];
-                continue; 
+                continue;
               }
             if (convex_hull[n].y != extreme.y)
-              continue; 
+              continue;
             if (convex_hull[n].x > extreme.x)
               extreme=convex_hull[n];
           }
@@ -3020,10 +3020,10 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             if (convex_hull[n].x < extreme.x)
               {
                 extreme=convex_hull[n];
-                continue; 
+                continue;
               }
             if (convex_hull[n].x != extreme.x)
-              continue; 
+              continue;
             if (convex_hull[n].y > extreme.y)
               extreme=convex_hull[n];
           }

diff --git a/MagickCore/splay-tree.c b/MagickCore/splay-tree.c
@@ -316,7 +316,7 @@ static void BalanceSplayTree(SplayTreeInfo *splay_tree)
 %  The format of the CloneSplayTree method is:
 %
 %      SplayTreeInfo *CloneSplayTree(SplayTreeInfo *splay_tree,
-%        void *(*clone_key)(void *),void *(*cline_value)(void *))
+%        void *(*clone_key)(void *),void *(*clone_value)(void *))
 %
 %  A description of each parameter follows:
 %

diff --git a/coders/miff.c b/coders/miff.c
@@ -842,6 +842,9 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
               {
                 if (LocaleCompare(keyword,"id") == 0)
                   {
+                    if (*id != '\0')
+                      ThrowMIFFException(CorruptImageError,
+                        "ImproperImageHeader");
                     (void) CopyMagickString(id,options,MagickPathExtent);
                     break;
                   }