[libpng16] Removed new redundant check for libpng < 12 in pngrutil.c

This commit is contained in:
Glenn Randers-Pehrson 2015-11-17 16:23:51 -06:00
parent 162f9f87f9
commit 001513c9ca
3 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
Libpng 1.6.20beta01 - November 13, 2015 Libpng 1.6.20beta01 - November 17, 2015
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -26,7 +26,7 @@ Other information:
Changes since the last public release (1.6.19): Changes since the last public release (1.6.19):
Version 1.6.20beta01 [(PENDING RELEASE)] Version 1.6.20beta01 [(PENDING RELEASE)]
Avoid potential pointer overflow in png_handle_sPLT() and Avoid potential pointer overflow/underflow in png_handle_sPLT() and
png_handle_pCAL() (Bug report by John Regehr). png_handle_pCAL() (Bug report by John Regehr).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -5415,7 +5415,7 @@ Version 1.6.19 [November 12, 2015]
Cleaned up coding style in png_handle_PLTE(). Cleaned up coding style in png_handle_PLTE().
Version 1.6.20beta01 [(PENDING RELEASE)] Version 1.6.20beta01 [(PENDING RELEASE)]
Avoid potential pointer overflow in png_handle_sPLT() and Avoid potential pointer overflow/underflow in png_handle_sPLT() and
png_handle_pCAL() (Bug report by John Regehr). png_handle_pCAL() (Bug report by John Regehr).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2174,7 +2174,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
/* We need to have at least 12 bytes after the purpose string /* We need to have at least 12 bytes after the purpose string
* in order to get the parameter information. * in order to get the parameter information.
*/ */
if (length < 12 || endptr - buf <= 12) if (endptr - buf <= 12)
{ {
png_chunk_benign_error(png_ptr, "invalid"); png_chunk_benign_error(png_ptr, "invalid");
return; return;