GraphicsMagick: ReadJPEGImage(): Use MagickAllocateResourceLimit...

changeset 03561d79e918 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=03561d79e918
summary: ReadJPEGImage(): Use MagickAllocateResourceLimitedClearedArray()

diffstat:

 ChangeLog                              |  7 +++++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 coders/jpeg.c                          |  5 +----
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  9 +++++++++
 5 files changed, 21 insertions(+), 8 deletions(-)

diffs (80 lines):

diff -r 6eb67db043d5 -r 03561d79e918 ChangeLog
--- a/ChangeLog	Wed Feb 08 08:29:12 2023 -0600
+++ b/ChangeLog	Sun Feb 12 09:39:29 2023 -0600
@@ -1,3 +1,10 @@
+2023-02-12  Bob Friesenhahn  <[email protected]>
+
+	* coders/jpeg.c (ReadJPEGImage): Replace
+	MagickAllocateResourceLimitedArray() with
+	MagickAllocateResourceLimitedClearedArray() and eliminate explicit
+	memset().
+
 2023-02-08  Bob Friesenhahn  <[email protected]>
 
 	* magick/blob.c (ImageToBlob): Immediately reject attempts to
diff -r 6eb67db043d5 -r 03561d79e918 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Wed Feb 08 08:29:12 2023 -0600
+++ b/VisualMagick/installer/inc/version.isx	Sun Feb 12 09:39:29 2023 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230208"
-#define public MagickPackageReleaseDate "snapshot-20230208"
+#define public MagickPackageVersionAddendum ".020230212"
+#define public MagickPackageReleaseDate "snapshot-20230212"
diff -r 6eb67db043d5 -r 03561d79e918 coders/jpeg.c
--- a/coders/jpeg.c	Wed Feb 08 08:29:12 2023 -0600
+++ b/coders/jpeg.c	Sun Feb 12 09:39:29 2023 -0600
@@ -1695,7 +1695,7 @@
         }
     }
 
-  jpeg_pixels=MagickAllocateResourceLimitedArray(JSAMPLE *,
+  jpeg_pixels=MagickAllocateResourceLimitedClearedArray(JSAMPLE *,
                                   jpeg_info.output_components,
                                   MagickArraySize(image->columns,
                                                   sizeof(JSAMPLE)));
@@ -1704,9 +1704,6 @@
       jpeg_destroy_decompress(&jpeg_info);
       ThrowJPEGReaderException(ResourceLimitError,MemoryAllocationFailed,image);
     }
-  (void) memset(jpeg_pixels,0,MagickArraySize(jpeg_info.output_components,
-                                              MagickArraySize(image->columns,
-                                                              sizeof(JSAMPLE))));
 
   /*
     Extended longjmp-based error handler (with jpeg_pixels)
diff -r 6eb67db043d5 -r 03561d79e918 magick/version.h
--- a/magick/version.h	Wed Feb 08 08:29:12 2023 -0600
+++ b/magick/version.h	Sun Feb 12 09:39:29 2023 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230208"
-#define MagickReleaseDate  "snapshot-20230208"
+#define MagickChangeDate   "20230212"
+#define MagickReleaseDate  "snapshot-20230212"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6eb67db043d5 -r 03561d79e918 www/Changelog.html
--- a/www/Changelog.html	Wed Feb 08 08:29:12 2023 -0600
+++ b/www/Changelog.html	Sun Feb 12 09:39:29 2023 -0600
@@ -37,6 +37,15 @@
 </div>
 
 <div class="document">
+<p>2023-02-12  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/jpeg.c (ReadJPEGImage): Replace
+MagickAllocateResourceLimitedArray() with
+MagickAllocateResourceLimitedClearedArray() and eliminate explicit
+memset().</p></li>
+</ul>
+</blockquote>
 <p>2023-02-08  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">