From 55fa898969d10e2d47bba0613175bf57a86c5a41 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 28 Dec 2013 21:47:27 +0100 Subject: [PATCH] avcodec/jpeg2000dec: zero Jpeg2000QuantStyle structure before use in get_qcd() Fixes: msan_uninit-mem_7f50b84aac30_6823_mjp2.mov Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index d3e49a19e6..3195104ad7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -540,6 +540,8 @@ static int get_qcd(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q, Jpeg2000QuantStyle tmp; int compno, ret; + memset(&tmp, 0, sizeof(tmp)); + if ((ret = get_qcx(s, n, &tmp)) < 0) return ret; for (compno = 0; compno < s->ncomponents; compno++)