[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: MAP: Fix null pointer dereference or SEGV if inp...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2017-07-22 21:29:37
Message-ID: mailman.1695.1500758985.9887.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 29550606d8b9 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=29550606d8b9
                
summary: MAP: Fix null pointer dereference or SEGV if input is not colormapped.

diffstat:

 ChangeLog          |   5 +++++
 coders/map.c       |  11 ++++++-----
 www/Changelog.html |   4 ++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 30cd2b31f7e0 -r 29550606d8b9 ChangeLog
--- a/ChangeLog	Sat Jul 22 15:40:00 2017 -0500
+++ b/ChangeLog	Sat Jul 22 16:29:35 2017 -0500
@@ -1,5 +1,10 @@
 2017-07-22  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* coders/map.c (WriteMAPImage): Fix null pointer dereference or
+	segmentation violation in the MAP writer if the input image is not
+	already colormapped.  Problem was reported by LCatro via email on
+	July 18.
+
 	* coders/gray.c (WriteGRAYImage): Improve tracing and tidy up.
 
 	* coders/rgb.c (WriteRGBImage): Fix heap overwrite in raw RGB
diff -r 30cd2b31f7e0 -r 29550606d8b9 coders/map.c
--- a/coders/map.c	Sat Jul 22 15:40:00 2017 -0500
+++ b/coders/map.c	Sat Jul 22 16:29:35 2017 -0500
@@ -18,7 +18,7 @@
 %                            M   M  A   A  P                                  %
 %                                                                             %
 %                                                                             %
-%                 Read/Write Image Colormaps As An Image File                 %
+%                 Read/Write Image Colormaps And Image File                   %
 %                                                                             %
 %                                                                             %
 %                              Software Design                                %
@@ -349,16 +349,17 @@
   /*
     Allocate colormap.
   */
-  if (!IsPaletteImage(image,&image->exception))
-    (void) SetImageType(image,PaletteType);
+  if (SetImageType(image,PaletteType) == MagickFail)
+    ThrowMAPWriterException(ResourceLimitError,MemoryAllocationFailed,image);
   packet_size=image->depth > 8 ? 2 : 1;
-  pixels=MagickAllocateMemory(unsigned char *,image->columns*packet_size);
+  pixels=MagickAllocateArray(unsigned char *,image->columns,packet_size);
   if (pixels == (unsigned char *) NULL)
     ThrowMAPWriterException(ResourceLimitError,MemoryAllocationFailed,image);
   packet_size=image->colors > 256 ? 6 : 3;
-  colormap=MagickAllocateMemory(unsigned char *,packet_size*image->colors);
+  colormap=MagickAllocateArray(unsigned char *,packet_size,image->colors);
   if (colormap == (unsigned char *) NULL)
     ThrowMAPWriterException(ResourceLimitError,MemoryAllocationFailed,image);
+
   /*
     Write colormap to file.
   */
diff -r 30cd2b31f7e0 -r 29550606d8b9 www/Changelog.html
--- a/www/Changelog.html	Sat Jul 22 15:40:00 2017 -0500
+++ b/www/Changelog.html	Sat Jul 22 16:29:35 2017 -0500
@@ -38,6 +38,10 @@
 <p>2017-07-22  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
  <blockquote>
 <ul class="simple">
+<li>coders/map.c (WriteMAPImage): Fix null pointer dereference or
+segmentation violation in the MAP writer if the input image is not
+already colormapped.  Problem was reported by LCatro via email on
+July 18.</li>
 <li>coders/gray.c (WriteGRAYImage): Improve tracing and tidy up.</li>
 <li>coders/rgb.c (WriteRGBImage): Fix heap overwrite in raw RGB
 writer (all output subformats) given a multiframe sequence using

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]