minecraft-pi-reborn/libpng
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[legacy] Check for integer overflow in png_set_rgb_to_gray().

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-06-07 15:56:02 -05:00
parent 1df0788b64
commit d572394c2a
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ANNOUNCE
View File

@ -113,6 +113,9 @@ version 1.2.45beta01 [June 7, 2011]
Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image, Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
always expand to RGBA if transparency is present. always expand to RGBA if transparency is present.
version 1.2.45beta02 [June 7, 2011]
Check for integer overflow in png_set_rgb_to_gray().
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement
to subscribe) or to glennrp at users.sourceforge.net to subscribe) or to glennrp at users.sourceforge.net

3
CHANGES
View File

@ -2714,6 +2714,9 @@ version 1.2.45beta01 [June 7, 2011]
Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image, Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
always expand to RGBA if transparency is present. always expand to RGBA if transparency is present.
version 1.2.45beta02 [June 7, 2011]
Check for integer overflow in png_set_rgb_to_gray().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

15
pngrtran.c
View File

@ -676,10 +676,21 @@ void PNGAPI
png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red, png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
double green) double green)
{ {
int red_fixed = (int)((float)red*100000.0 + 0.5); int red_fixed, green_fixed;
int green_fixed = (int)((float)green*100000.0 + 0.5);
if (png_ptr == NULL) if (png_ptr == NULL)
return; return;
if (red > 21474.83647 || red < -21474.83648 ||
green > 21474.83647 || green < -21474.83648)
{
png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
red_fixed = -1;
green_fixed = -1;
}
else
{
red_fixed = (int)((float)red*100000.0 + 0.5);
green_fixed = (int)((float)green*100000.0 + 0.5);
}
png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed); png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
} }
#endif #endif