Changeset 3672 for ImageMagick/trunk/coders/png.c

Timestamp:

02/21/11 07:06:32 (2 years ago)

Author:

glennrp

Message:

Comment out unused png_exclude_* and check the "count" return while reading PNG signature.

File:

• ImageMagick/trunk/coders/png.c (modified) (3 diffs)

ImageMagick/trunk/coders/png.c

@@ -3107 +3107 @@
   */
   count=ReadBlob(image,8,(unsigned char *) magic_number);
-  (void) count;
-
-  if (memcmp(magic_number,"\211PNG\r\n\032\n",8) != 0)
+
+  if (count < 8 || memcmp(magic_number,"\211PNG\r\n\032\n",8) != 0)
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
 
@@ -6949 +6948 @@
   ping_exclude_bKGD=mng_info->ping_exclude_bKGD;
   ping_exclude_cHRM=mng_info->ping_exclude_cHRM;
-  ping_exclude_EXIF=mng_info->ping_exclude_EXIF; /* hex-encoded EXIF in zTXt */
-  (void) ping_exclude_EXIF;
+  /* ping_exclude_EXIF=mng_info->ping_exclude_EXIF; */
   ping_exclude_gAMA=mng_info->ping_exclude_gAMA;
   ping_exclude_cHRM=mng_info->ping_exclude_cHRM;
@@ -6959 +6957 @@
   ping_exclude_sRGB=mng_info->ping_exclude_sRGB;
   ping_exclude_tEXt=mng_info->ping_exclude_tEXt;
-  ping_exclude_tRNS=mng_info->ping_exclude_tRNS;
-  (void) ping_exclude_tRNS;
+  /* ping_exclude_tRNS=mng_info->ping_exclude_tRNS; */
   ping_exclude_vpAg=mng_info->ping_exclude_vpAg;
   ping_exclude_zCCP=mng_info->ping_exclude_zCCP; /* hex-encoded iCCP in zTXt */