diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 14:45:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 14:46:43 +0200 |
| commit | 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e (patch) | |
| tree | 03b0eeb533a88aae939a1ec98d4c3220b6f659aa /libavcodec/mmvideo.c | |
| parent | 97cb9b6cbb0ea1e8127a4a52790a8e35c20988ed (diff) | |
| download | ffmpeg-streaming-8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e.zip ffmpeg-streaming-8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e.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>
Diffstat (limited to '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 026d463..9ff6393 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; |
