From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 18 Jul 2019 10:24:40 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1641
X-Git-Tag: 7.0.8-55~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39f226a9c137f547e12afde972eeba7551124493;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1641
---

diff --git a/ChangeLog b/ChangeLog
index cba66b8b7..52dcc9bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,23 @@
+2019-07-18  7.0.8-55 Cristy  <quetzlzacatenango@image...>
+  * Release ImageMagick version 7.0.8-55, GIT revision 15...
+
+2019-07-18  7.0.8-55 Cristy  <quetzlzacatenango@image...>
+  * Heap-buffer overflow (reference
+    https://github.com/ImageMagick/ImageMagick/issues/1641
+
 2019-07-16  7.0.8-54 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-54, GIT revision 15916:e868e22:20190716.
 
 2019-07-08  7.0.8-54 Cristy  <quetzlzacatenango@image...>
-   * resolve division by zero  (reference
+  * resolve division by zero  (reference
      https://github.com/ImageMagick/ImageMagick/issues/1629).
-   * introducing MagickLevelImageColors() MagickWand method.
+  * introducing MagickLevelImageColors() MagickWand method.
   * Transient problem with text placement with gravity (reference
     https://github.com/ImageMagick/ImageMagick/issues/1633).
   * Support TIM2 image format (reference
     https://github.com/ImageMagick/ImageMagick/pull/1571).
   * For -magnify option, specify an alternative scaling method with -define
-	  magnify:method=method, choose from these methods: eagle2X, eagle3X,
+    magnify:method=method, choose from these methods: eagle2X, eagle3X,
     eagle3XB, epb2X, fish2X, hq2X,  scale2X (default), scale3X, xbr2X.
 
 2019-07-05  7.0.8-53 Cristy  <quetzlzacatenango@image...>
@@ -1488,7 +1495,7 @@
 2016-04-30  7.0.1-0 Cristy  <quetzlzacatenango@image...>
   * New version 7.0.1-0, GIT revision 10716:b527bce:20160430.
 
-2016-01-30  7.0.0-0 	Fahad-Alsaidi & ShamsaHamed
+2016-01-30  7.0.0-0 Fahad-Alsaidi & ShamsaHamed
   * Add support for languages that require complex text layout (reference
     https://github.com/ImageMagick/ImageMagick/pull/88).
 
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 275be95cd..087bf09d2 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -564,6 +564,7 @@ static boolean ReadICCProfile(j_decompress_ptr jpeg_info)
       break;
     *p++=(unsigned char) c;
   }
+  error_manager->profile=NULL;
   if (i != (ssize_t) length)
     {
       profile=DestroyStringInfo(profile);
@@ -572,7 +573,6 @@ static boolean ReadICCProfile(j_decompress_ptr jpeg_info)
         image->filename);
       return(FALSE);
     }
-  error_manager->profile=NULL;
   icc_profile=(StringInfo *) GetImageProfile(image,"icc");
   if (icc_profile != (StringInfo *) NULL)
     {
@@ -698,7 +698,9 @@ static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info)
         image->filename);
       return(FALSE);
     }
-  /* The IPTC profile is actually an 8bim */
+  /*
+    The IPTC profile is actually an 8bim.
+  */
   iptc_profile=(StringInfo *) GetImageProfile(image,"8bim");
   if (iptc_profile != (StringInfo *) NULL)
     {