diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 14:45:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:48 +0100 |
| commit | 19d0c9e9934b6460e1c6d815c9cf31653fcddcfc (patch) | |
| tree | 0fe0554f687a256eddc3598ad8b77208a745c619 | |
| parent | bd3a28e8b65cd1bbe550e03bc7647831d4ea3d18 (diff) | |
| download | ffmpeg-19d0c9e9934b6460e1c6d815c9cf31653fcddcfc.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 21d6669327..b480533128 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -114,7 +114,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; |