From 87ec3c615689e3d8bce36f1a168d908c7502b867 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 16 Dec 2014 16:24:55 +0100 Subject: [PATCH] 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 (cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd) Conflicts: libavcodec/vmdav.c --- libavcodec/vmdav.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 1e5f2caab8..2b491ad86a 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -319,8 +319,12 @@ static void vmd_decode(VmdVideoContext *s) len = rle_unpack(gb.buffer, &dp[ofs], len, bytestream2_get_bytes_left(&gb), frame_width - ofs); - else + else { + if (ofs + len > frame_width || + bytestream2_get_bytes_left(&gb) < len) + return; bytestream2_get_buffer(&gb, &dp[ofs], len); + } bytestream2_skip(&gb, len); } else { /* interframe pixel copy */