mmvideo: Make sure the rle does not write over the frame boundaries
authorLuca Barbato <lu_zero@gentoo.org>
Thu, 10 Sep 2015 12:46:05 +0000 (14:46 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Fri, 11 Sep 2015 16:19:00 +0000 (18:19 +0200)
Bug-Id: 887
CC: libav-stable@libav.org
libavcodec/mmvideo.c

index f8adcdd..0736630 100644 (file)
@@ -99,7 +99,8 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert)
     while (bytestream2_get_bytes_left(&s->gb) > 0) {
         int run_length, color;
 
-        if (y >= s->avctx->height)
+        // writes one more line when half_vert is true
+        if (y >= s->avctx->height + !!half_vert)
             return 0;
 
         color = bytestream2_get_byte(&s->gb);
@@ -113,6 +114,9 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert)
         if (half_horiz)
             run_length *=2;
 
+        if (s->avctx->width - x < run_length)
+            return AVERROR_INVALIDDATA;
+
         if (color) {
             memset(s->frame->data[0] + y*s->frame->linesize[0] + x, color, run_length);
             if (half_vert)