Module: libav Branch: release/9 Commit: 905f5c8a1e94d224245480298b1854e103d71141
Author: Justin Ruggles <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Wed Jan 16 18:10:57 2013 -0500 png: use av_mallocz_array() for the zlib zalloc function Fixes valgrind uninitialized memory errors when decoding png. CC:[email protected] (cherry picked from commit 486f0b0cfc800cd38ec06635630539431d296774) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/png.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libavcodec/png.c b/libavcodec/png.c index 70a080e..65d6964 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) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
