Commit 0bb3578ee for imagemagick.org
commit 0bb3578ee087f3c4f14bbf1d8883ae456fc99092
Author: Cristy <urban-warrior@imagemagick.org>
Date: Fri Jun 5 09:18:28 2026 -0400
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-99w9-hv66-rfv7
diff --git a/coders/png.c b/coders/png.c
index e1f89326e..12a1df349 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -12740,7 +12740,11 @@ static MagickBooleanType WriteOneJNGImage(MngWriteInfo *mng_info,
(double) jpeg_image->rows);
if (status == MagickFalse)
- ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ {
+ jpeg_image_info=DestroyImageInfo(jpeg_image_info);
+ jpeg_image=DestroyImage(jpeg_image);
+ ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ }
if (jng_color_type == 8 || jng_color_type == 12)
jpeg_image_info->type=GrayscaleType;
@@ -12759,10 +12763,8 @@ static MagickBooleanType WriteOneJNGImage(MngWriteInfo *mng_info,
if (blob == (unsigned char *) NULL)
{
- if (jpeg_image != (Image *)NULL)
- jpeg_image=DestroyImage(jpeg_image);
- if (jpeg_image_info != (ImageInfo *)NULL)
- jpeg_image_info=DestroyImageInfo(jpeg_image_info);
+ jpeg_image=DestroyImage(jpeg_image);
+ jpeg_image_info=DestroyImageInfo(jpeg_image_info);
return(MagickFalse);
}