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

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: TIFF: Fix unchecked allocation in TIFFIgnoreTags()
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2017-09-30 14:12:25
Message-ID: mailman.1699.1506780753.12767.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 7b3342b4986b in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=7b3342b4986b
                
summary: TIFF: Fix unchecked allocation in TIFFIgnoreTags()

diffstat:

 ChangeLog                              |   5 +++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/tiff.c                          |  22 ++++++++++++++--------
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   7 +++++++
 5 files changed, 30 insertions(+), 12 deletions(-)

diffs (112 lines):

diff -r da621c4e107f -r 7b3342b4986b ChangeLog
--- a/ChangeLog	Sat Sep 30 08:49:45 2017 -0500
+++ b/ChangeLog	Sat Sep 30 09:12:22 2017 -0500
@@ -1,3 +1,8 @@
+2017-09-30  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* coders/tiff.c (TIFFIgnoreTags): Fix SourceForge issue #476 "NULL
+	Pointer in tiff.c".
+
 2017-09-25  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* magick/blob.c (GetConfigureBlob): Fix SourceForge issue #472
diff -r da621c4e107f -r 7b3342b4986b VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Sep 30 08:49:45 2017 -0500
+++ b/VisualMagick/installer/inc/version.isx	Sat Sep 30 09:12:22 2017 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020170925"
-#define public MagickPackageReleaseDate "snapshot-20170925"
+#define public MagickPackageVersionAddendum ".020170930"
+#define public MagickPackageReleaseDate "snapshot-20170930"
diff -r da621c4e107f -r 7b3342b4986b coders/tiff.c
--- a/coders/tiff.c	Sat Sep 30 08:49:45 2017 -0500
+++ b/coders/tiff.c	Sat Sep 30 09:12:22 2017 -0500
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003 - 2016 GraphicsMagick Group
+% Copyright (C) 2003 - 2017 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 % Copyright 1991-1999 E. I. du Pont de Nemours and Company
 %
@@ -276,8 +276,8 @@
     *p,
     *tags;
 
-  const ImageInfo
-    *image_info;
+  Magick_TIFF_ClientData
+    *client_data;
 
   register ssize_t
     i;
@@ -291,8 +291,10 @@
   if (TIFFGetReadProc(tiff) != TIFFReadBlob)
     return;
 
-  image_info=((Magick_TIFF_ClientData *)TIFFClientdata(tiff))->image_info;
-  tags=AccessDefinition(image_info,"tiff","ignore-tags");
+  client_data=((Magick_TIFF_ClientData *) TIFFClientdata(tiff));
+  if (client_data == (Magick_TIFF_ClientData *) NULL)
+    return;
+  tags=AccessDefinition(client_data->image_info,"tiff","ignore-tags");
   if (tags == (const char *) NULL)
     return;
   count=0;
@@ -303,9 +305,7 @@
         p++;
 
       {
-        /* Avoid warning about unused strtol return value on Linux */
-        long ignored = strtol(p,&q,10);
-        (void) ignored;
+        (void) strtol(p,&q,10);
       }
       if (p == q)
         return;
@@ -321,6 +321,12 @@
   i=0;
   p=tags;
   ignore=MagickAllocateArray(TIFFFieldInfo*,count,sizeof(*ignore));
+  if (ignore == (TIFFFieldInfo*) NULL)
+    {
+      ThrowException(&client_data->image->exception,ResourceLimitError,
+                     MemoryAllocationFailed,client_data->image->filename);
+      return;
+    }
   /* This also sets field_bit to 0 (FIELD_IGNORE) */
   (void) memset(ignore,0,count*sizeof(*ignore));
   while (*p != '\0')
diff -r da621c4e107f -r 7b3342b4986b magick/version.h
--- a/magick/version.h	Sat Sep 30 08:49:45 2017 -0500
+++ b/magick/version.h	Sat Sep 30 09:12:22 2017 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x191600
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 19,16,0
-#define MagickChangeDate   "20170925"
-#define MagickReleaseDate  "snapshot-20170925"
+#define MagickChangeDate   "20170930"
+#define MagickReleaseDate  "snapshot-20170930"
 	
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r da621c4e107f -r 7b3342b4986b www/Changelog.html
--- a/www/Changelog.html	Sat Sep 30 08:49:45 2017 -0500
+++ b/www/Changelog.html	Sat Sep 30 09:12:22 2017 -0500
@@ -35,6 +35,13 @@
 <div class="document">
 
 
+<p>2017-09-30  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/tiff.c (TIFFIgnoreTags): Fix SourceForge issue #476 &quot;NULL
+Pointer in tiff.c&quot;.</li>
+</ul>
+</blockquote>
 <p>2017-09-25  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">

------------------------------------------------------------------------------
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]