summaryrefslogtreecommitdiff
path: root/pngtrans.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2012-06-07 10:18:25 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2012-06-07 10:18:25 -0500
commit905cc94e3dcaa11bead936f4a49d8d7f3636f05c (patch)
tree49aacf90766bf87c8ced80a1c07d6ae30d6899f6 /pngtrans.c
parent8f424b82701957e4ac19d4b0f84836f28bf5a6e5 (diff)
downloadlibpng-905cc94e3dcaa11bead936f4a49d8d7f3636f05c.tar.gz
[libpng16] Don't check palette indexes if num_palette is 0 (as it can be in
MNG files).
Diffstat (limited to 'pngtrans.c')
-rw-r--r--pngtrans.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pngtrans.c b/pngtrans.c
index 1d4bf6122..bbf97a642 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -625,7 +625,8 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
void /* PRIVATE */
png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
{
- if (png_ptr->num_palette < (1 << row_info->bit_depth))
+ if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
+ png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
{
/* Calculations moved outside switch in an attempt to stop different
* compiler warnings. 'padding' is in *bits* within the last byte, it is