From 61edda9a4a34573cd7335d17099a7b8d1553549a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 15 Dec 2013 13:22:57 +0100 Subject: [PATCH] avcodec/msmpeg4dec: initialize dir_ptr in error cases Fixes use of uinitialized memory Fixes: msan_uninit-mem_7f01b8799186_7278_msnaudio.asf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/msmpeg4dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index d689b18572..a5845d8a01 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -588,6 +588,7 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) } if (level < 0) { av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); + *dir_ptr = 0; return -1; } level-=256; @@ -599,6 +600,7 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) } if (level < 0){ av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); + *dir_ptr = 0; return -1; }