diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 14:45:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 15:10:48 +0200 |
| commit | 16775c7aaa0798c396036e55336fc5c087cc202e (patch) | |
| tree | cddcc4b204f89d6e975030e1bbd391653e0f61ec | |
| parent | ac82e318bb81933a427efa1038a24483c00c77a8 (diff) | |
| download | ffmpeg-16775c7aaa0798c396036e55336fc5c087cc202e.tar.gz | |
avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks
Fixes out of array access
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e)
Conflicts:
libavcodec/mmvideo.c
| -rw-r--r-- | libavcodec/mmvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 292ebe68b9..f028e5765d 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -109,7 +109,7 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert) if (color) { memset(s->frame.data[0] + y*s->frame.linesize[0] + x, color, run_length); - if (half_vert) + if (half_vert && y + half_vert < s->avctx->height) memset(s->frame.data[0] + (y+1)*s->frame.linesize[0] + x, color, run_length); } x+= run_length; |