diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 14:45:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 20:27:41 +0100 |
| commit | 9b4507e423e53b6fe2b278fdfb62124721c11dfc (patch) | |
| tree | bcb1adb093982fd322377d4cd43046b69527053f | |
| parent | f7170c48328d5d1b22a2d5e7e8888fab37da37b5 (diff) | |
| download | ffmpeg-9b4507e423e53b6fe2b278fdfb62124721c11dfc.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
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 238b991a8d..d45564c2cf 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -104,7 +104,7 @@ static void mm_decode_intra(MmContext * s, int half_horiz, int half_vert, const 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; |