[libpng12] Fixed bug recently introduced in png_set_PLTE() that uses png_ptr

not info_ptr.
This commit is contained in:
Glenn Randers-Pehrson 2015-11-22 20:24:03 -06:00
parent e5ecad4327
commit ad224c6907
3 changed files with 7 additions and 3 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.55beta02 - November 22, 2015
Libpng 1.2.55beta02 - November 23, 2015
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.
@ -48,6 +48,8 @@ version 1.2.55beta01 [November 20, 2015]
png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr).
version 1.2.55beta02 [%RDATE%]
Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
not info_ptr.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -2899,6 +2899,8 @@ version 1.2.55beta01 [November 20, 2015]
png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr).
version 1.2.55beta02 [%RDATE%]
Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
not info_ptr.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -456,8 +456,8 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
if (png_ptr == NULL || info_ptr == NULL)
return;
max_palette_length = (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
(1 << png_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
max_palette_length = (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
(1 << info_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
if (num_palette < 0 || num_palette > (int) max_palette_length)
{