diff --git a/ANNOUNCE b/ANNOUNCE index 6850b3d21..508c808d4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -53,8 +53,7 @@ version 1.4.13beta04 [January 1, 2014] version 1.4.13beta05 [January 10, 2014] Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1 - Revised png_check_IHDR() to use PNG_SIZE_MAX instead of PNG_UINT_32_MAX - in the test for potential overflow in PNG_ROWBYTES. + Removed potentially misleading warning from png_check_IHDR(). Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 06aefc593..3f47e6aa9 100644 --- a/CHANGES +++ b/CHANGES @@ -2895,8 +2895,7 @@ version 1.4.13beta04 [January 1, 2014] version 1.4.13beta05 [January 10, 2014] Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1 - Revised png_check_IHDR() to use PNG_SIZE_MAX instead of PNG_UINT_32_MAX - in the test for potential overflow in PNG_ROWBYTES. + Removed potentially misleading warning from png_check_IHDR(). Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.c b/png.c index 7720c772b..b031ce8f7 100644 --- a/png.c +++ b/png.c @@ -823,17 +823,6 @@ png_check_IHDR(png_structp png_ptr, error = 1; } - /* Check for potential overflow in PNG_ROWBYTES calculation */ - if (error == 0 && width > (PNG_SIZE_MAX - >> 3) /* 8-byte RGBA pixels */ - - 64 /* bigrowbuf hack */ - - 1 /* filter byte */ - - 7*8 /* rounding of width to multiple of 8 pixels */ - - 8 /* extra max_pixel_depth pad */ - - error) /* to prevent always-false compiler warning */ - png_warning(png_ptr, - "Width may be too large for libpng to process pixels"); - /* Check other values */ if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && bit_depth != 8 && bit_depth != 16)