diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 13:22:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 13:24:05 +0100 |
| commit | 61edda9a4a34573cd7335d17099a7b8d1553549a (patch) | |
| tree | 317922fbcc7ea4e2dd7167a55c08442de208c417 /libavcodec/msmpeg4dec.c | |
| parent | 81230e2612a9c88e5b35ed2f67d828450cc50abf (diff) | |
| download | ffmpeg-61edda9a4a34573cd7335d17099a7b8d1553549a.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4dec.c')
| -rw-r--r-- | libavcodec/msmpeg4dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |