[libpng16] Imported from libpng-1.6.33beta01.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 9e36cb3..11b301a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -26,9 +26,6 @@
Changes since the last public release (1.6.32):
Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
- Free row_ptr in PNG_CLEANUP macro in contrib/oss-fuzz/libpng_read_fuzzer.cc
- Fixed off-by-one error in png_do_check_palette_indexes() (Bug report
- by Mick P., Source Forge Issue #269).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index a5530f8..521d89d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5997,9 +5997,6 @@
Version 1.6.33beta01 [August 28, 2017]
Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
- Free row_ptr in PNG_CLEANUP macro in contrib/oss-fuzz/libpng_read_fuzzer.cc
- Fixed off-by-one error in png_do_check_palette_indexes() (Bug report
- by Mick P., Source Forge Issue #269).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/contrib/pngminus/pnm2png.c b/contrib/pngminus/pnm2png.c
index 2298136..0d2caef 100644
--- a/contrib/pngminus/pnm2png.c
+++ b/contrib/pngminus/pnm2png.c
@@ -392,7 +392,7 @@
return FALSE;
}
if ((png_pixels = (png_byte *)
- malloc (row_bytes * height * sizeof (png_byte))) == NULL)
+ malloc ((size_t)row_bytes * (size_t)height * sizeof (png_byte))) == NULL)
return FALSE;
/* read data from PNM file */
