mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng14] Removed potentially misleading warning from png_check_IHDR().

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2014-01-10 06:10:56 -06:00
parent cb7e08875a
commit 8578282f04
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ANNOUNCE
View File

@ -53,8 +53,7 @@ version 1.4.13beta04 [January 1, 2014]
version 1.4.13beta05 [January 10, 2014] version 1.4.13beta05 [January 10, 2014]
Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1 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 Removed potentially misleading warning from png_check_IHDR().
in the test for potential overflow in PNG_ROWBYTES.
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit

3
CHANGES
View File

@ -2895,8 +2895,7 @@ version 1.4.13beta04 [January 1, 2014]
version 1.4.13beta05 [January 10, 2014] version 1.4.13beta05 [January 10, 2014]
Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1 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 Removed potentially misleading warning from png_check_IHDR().
in the test for potential overflow in PNG_ROWBYTES.
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit

11
png.c
View File

@ -823,17 +823,6 @@ png_check_IHDR(png_structp png_ptr,
error = 1; 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 */ /* Check other values */
if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
bit_depth != 8 && bit_depth != 16) bit_depth != 8 && bit_depth != 16)