OSDN Git Service

avcodec/msmpeg4dec: initialize dir_ptr in error cases
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Dec 2013 12:22:57 +0000 (13:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Dec 2013 12:24:05 +0000 (13:24 +0100)
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 <michaelni@gmx.at>
libavcodec/msmpeg4dec.c

index d689b18..a5845d8 100644 (file)
@@ -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;
         }