From e31b1938acbe8bd9c5e1dc4be674601ec6823bcf Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 15 Nov 2012 19:15:35 +0100 Subject: zmbv: avoid use of uninitialized data Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/zmbv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/zmbv.c') diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 8727bfc8b9..1b9435150f 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -493,6 +493,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac c->by = (c->height+ c->bh - 1) / c->bh; if (!c->cur || !c->prev) return -1; + memset(c->cur, 0, avctx->width * avctx->height * (c->bpp / 8)); + memset(c->prev, 0, avctx->width * avctx->height * (c->bpp / 8)); c->decode_intra= decode_intra; } @@ -633,7 +635,7 @@ static av_cold int decode_init(AVCodecContext *avctx) /* Allocate decompression buffer */ if (c->decomp_size) { - if ((c->decomp_buf = av_malloc(c->decomp_size)) == NULL) { + if ((c->decomp_buf = av_mallocz(c->decomp_size)) == NULL) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); return AVERROR(ENOMEM); -- cgit v1.2.3