[FFmpeg-cvslog] avcodec/interplayvideo: Check that enough data is available for opcode_0xA

Michael Niedermayer git at videolan.org
Thu Dec 19 00:47:17 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 19 00:17:12 2013 +0100| [ff1e30c059386db05131fe2f5bca1f35e1f5ac7e] | committer: Michael Niedermayer

avcodec/interplayvideo: Check that enough data is available for opcode_0xA

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f90e5be6b30_3965_baldursgate_camp.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=ff1e30c059386db05131fe2f5bca1f35e1f5ac7e
---

 libavcodec/interplayvideo.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 7ac1456..71f89ab 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -374,6 +374,11 @@ static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s, AVFrame *frame)
     unsigned char P[8];
     int flags = 0;
 
+    if (bytestream2_get_bytes_left(&s->stream_ptr) < 16) {
+        av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0xA\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     bytestream2_get_buffer(&s->stream_ptr, P, 4);
 
     /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on



More information about the ffmpeg-cvslog mailing list