eliminate rare memory leak

ImageMagick · Mar 2, 2024 · 3fb6732 · 3fb6732
1 parent 4eb3fc8
commit 3fb6732
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/coders/icon.c b/coders/icon.c
@@ -248,8 +248,11 @@ static Image *Read1XImage(Image *image,ExceptionInfo *exception)
   rows=(size_t) (ReadBlobLSBShort(image));
   (void) ReadBlobLSBShort(image);  /* width of bitmap in bytes */
   (void) ReadBlobLSBShort(image);  /* cursor color */
-  if ((rows != 32 && rows != 64) || (columns != 32 && columns != 64))
-    ThrowImageException(CorruptImageError,"ImproperImageHeader");
+  if (((rows != 32) && (rows != 64)) || ((columns != 32) && (columns != 64)))
+    {
+      image=DestroyImageList(image);
+      ThrowImageException(CorruptImageError,"ImproperImageHeader");
+    }
   /*
     Convert bitmap scanline.
   */
@@ -304,7 +307,8 @@ static Image *Read1XImage(Image *image,ExceptionInfo *exception)
         break;
     }
   }
-  (void) SyncImage(image);
+  if (SyncImage(image) == MagickFalse)
+    return(DestroyImageList(image));
   if (CloseBlob(image) == MagickFalse)
     return(DestroyImageList(image));
   return(GetFirstImageInList(image));