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

[libpng16] Nullify trans_color with out-of-range value, to stop oss-fuzz issue.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2017-10-15 11:04:53 -05:00
parent ccc77d2a8d
commit 2be0f33e7c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pngset.c
View File

@@ -1025,7 +1025,6 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
if (trans_color != NULL)
{
#ifdef PNG_WARNINGS_SUPPORTED
if (info_ptr->bit_depth < 16)
{
int sample_max = (1 << info_ptr->bit_depth) - 1;
@@ -1036,14 +1035,16 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
(trans_color->red > sample_max ||
trans_color->green > sample_max ||
trans_color->blue > sample_max)))
{
png_warning(png_ptr,
"tRNS chunk has out-of-range samples for bit_depth");
trans_color = NULL;
}
}
#endif
info_ptr->trans_color = *trans_color;
if (num_trans == 0)
if (num_trans == 0 && trans_color != NULL)
num_trans = 1;
}