]> granicus.if.org Git - imagemagick/commitdiff
Fix improper use of NULL in the JNG decoder (Issue 632)
authorGlenn Randers-Pehrson <glennrp@gmail.com>
Sun, 30 Jul 2017 08:38:59 +0000 (04:38 -0400)
committerGlenn Randers-Pehrson <glennrp@gmail.com>
Sun, 30 Jul 2017 08:38:59 +0000 (04:38 -0400)
ChangeLog
coders/png.c

index b4d1adcb78cbb0df1393199eaa9dc21b925215a2..23bf6513d6b7c9299e69b6b0323f3457b7ec1fda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,12 +3,14 @@
     it was setting image->gamma, but only setting image->colorspace
     for grayscale and gray-alpha images.  Reference
     https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32418).
+  * Fix improper use of NULL in the JNG decoder (Reference
+    https://github.com/ImageMagick/ImageMagick/issues/632).
 
 2017-07-29  7.0.6-5 Cristy  <quetzlzacatenango@image...>
   * Off by one error for gradient coder (reference
-    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32416).
-
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32416),
     https://github.com/ImageMagick/ImageMagick/issues/612).
+
 2017-07-28  7.0.6-4 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.6-4, GIT revision 20657:4e81160d6:20170728.
 
index 9c03e6754bb7b8cbc993aecd9b46c31f49ca5516..e8e264f0ea259bcceef651e578bcb1a17d8a31d8 100644 (file)
@@ -4502,7 +4502,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
       {
         if (length > GetBlobSize(image))
           {
-            DestroyJNG(NULL,&color_image,&color_image_info,NULL,NULL);
+            DestroyJNG(NULL,&color_image,&color_image_info,
+              &alpha_image,&alpha_image_info);
             ThrowReaderException(CorruptImageError,
               "InsufficientImageDataInFile");
           }