diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 16:24:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:35 +0100 |
| commit | 24fefa73dba44d07b4cef8b6243cfa37f6ec3e54 (patch) | |
| tree | ffbe360a4883d5a302eaec9467b690f3b3445488 | |
| parent | 9189ae8ff4b74984775850cdae72dc833f401867 (diff) | |
| download | ffmpeg-24fefa73dba44d07b4cef8b6243cfa37f6ec3e54.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)
Conflicts:
libavcodec/vmdav.c
| -rw-r--r-- | libavcodec/vmdav.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 9c24a01ba7..f17bd493f0 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -340,8 +340,12 @@ static int 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 AVERROR_INVALIDDATA; bytestream2_get_buffer(&gb, &dp[ofs], len); + } bytestream2_skip(&gb, len); } else { /* interframe pixel copy */ |