avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 12:45:04 +0000 (14:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 17:03:48 +0000 (18:03 +0100)
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>
libavcodec/mmvideo.c

index 21d6669..b480533 100644 (file)
@@ -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;