diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 19:15:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 20:58:36 +0100 |
| commit | e31b1938acbe8bd9c5e1dc4be674601ec6823bcf (patch) | |
| tree | 3b0eaa2b81c887c5e5976eeb63f8a04e218776ed /libavcodec | |
| parent | c2409a7c5b1c1f43ee8b00c13ed41edc0321db0b (diff) | |
| download | ffmpeg-e31b1938acbe8bd9c5e1dc4be674601ec6823bcf.tar.gz | |
zmbv: avoid use of uninitialized data
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/zmbv.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |