From 2690782292a7ffa4b4405aec1818253a64522baa Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 10 Feb 2021 13:36:11 -0800 Subject: [PATCH] pngdec: check version before using png_get_chunk_malloc_max png_get_chunk_malloc_max / png_set_chunk_malloc_max were added in 1.4.1. Bug: webp:505, webp:497 Change-Id: Id4e0643a7734563fec7779f7943ec760da8d276d --- imageio/pngdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/imageio/pngdec.c b/imageio/pngdec.c index e0b152ed..44d0d1a1 100644 --- a/imageio/pngdec.c +++ b/imageio/pngdec.c @@ -259,11 +259,14 @@ int ReadPNG(const uint8_t* const data, size_t data_size, goto End; } +#if LOCAL_PNG_PREREQ(1,5) || \ + (LOCAL_PNG_PREREQ(1,4) && PNG_LIBPNG_VER_RELEASE >= 1) // If it looks like the bitstream is going to need more memory than libpng's // internal limit (default: 8M), try to (reasonably) raise it. if (data_size > png_get_chunk_malloc_max(png) && data_size < (1u << 24)) { png_set_chunk_malloc_max(png, data_size); } +#endif info = png_create_info_struct(png); if (info == NULL) goto Error;