[FFmpeg-cvslog] avformat/ipmovie: Check OPCODE_CREATE_TIMER size

Michael Niedermayer git at videolan.org
Sat Dec 14 22:07:20 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 14 21:22:14 2013 +0100| [892562e9218b0ae55c5ad7abb5b49bafcdc922ff] | committer: Michael Niedermayer

avformat/ipmovie: Check OPCODE_CREATE_TIMER size

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f81e836ef8c_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.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=892562e9218b0ae55c5ad7abb5b49bafcdc922ff
---

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

diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index ff5699a..57664f1 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -321,7 +321,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb,
 
         case OPCODE_CREATE_TIMER:
             av_dlog(NULL, "create timer\n");
-            if ((opcode_version > 0) || (opcode_size > 6)) {
+            if ((opcode_version > 0) || (opcode_size != 6)) {
                 av_dlog(NULL, "bad create_timer opcode\n");
                 chunk_type = CHUNK_BAD;
                 break;



More information about the ffmpeg-cvslog mailing list