[FFmpeg-cvslog] avformat/ipmovie: Check that the OPCODE_INIT_AUDIO_BUFFERS size is large enough

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 18 23:13:15 2013 +0100| [8faabf3bd29cf587a8c5b8aa38836e9c99dba054] | committer: Michael Niedermayer

avformat/ipmovie: Check that the OPCODE_INIT_AUDIO_BUFFERS size is large enough

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f75b03c1f19_4820_descent3_level5_16bit_partial.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8faabf3bd29cf587a8c5b8aa38836e9c99dba054
---

 libavformat/ipmovie.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index 57664f1..6d2cc05 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -339,7 +339,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb,
 
         case OPCODE_INIT_AUDIO_BUFFERS:
             av_dlog(NULL, "initialize audio buffers\n");
-            if ((opcode_version > 1) || (opcode_size > 10)) {
+            if ((opcode_version > 1) || (opcode_size > 10) || opcode_size < 6) {
                 av_dlog(NULL, "bad init_audio_buffers opcode\n");
                 chunk_type = CHUNK_BAD;
                 break;