From 486f0b0cfc800cd38ec06635630539431d296774 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 16 Jan 2013 18:10:57 -0500 Subject: png: use av_mallocz_array() for the zlib zalloc function Fixes valgrind uninitialized memory errors when decoding png. CC:libav-stable@libav.org --- libavcodec/png.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec/png.c') diff --git a/libavcodec/png.c b/libavcodec/png.c index 70a080e29e..65d696476a 100644 --- a/libavcodec/png.c +++ b/libavcodec/png.c @@ -47,9 +47,7 @@ const uint8_t ff_png_pass_mask[NB_PASSES] = { void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size) { - if(items >= UINT_MAX / size) - return NULL; - return av_malloc(items * size); + return av_mallocz_array(items, size); } void ff_png_zfree(void *opaque, void *ptr) -- cgit v1.2.3