ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Tue Dec 16 16:24:55 2014 +0100| [7279be7c75c38547994466b6f95bc3cadb05238b] | committer: Michael Niedermayer
avcodec/vmdvideo: Check len before using it in method 3 Fixes out of array access Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7279be7c75c38547994466b6f95bc3cadb05238b --- libavcodec/vmdav.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index c1fb80b..91d245a 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -352,6 +352,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame) ofs += slen; bytestream2_skip(&gb, len); } else { + if (ofs + len > frame_width || + bytestream2_get_bytes_left(&gb) < len) + return AVERROR_INVALIDDATA; bytestream2_get_buffer(&gb, &dp[ofs], len); ofs += len; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
