Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / aasc.c

diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 919bbc72bdc628506a049341bf3b85c0aa5e7a36..197bfe5f0542819f9949d951bafabb4b63805955 100644 (file)
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -79,8 +79,13 @@ static int aasc_decode_frame(AVCodecContext *avctx,
     case 0:
         stride = (avctx->width * 3 + 3) & ~3;
         for(i = avctx->height - 1; i >= 0; i--){
+            if(avctx->width*3 > buf_size){
+                av_log(avctx, AV_LOG_ERROR, "Next line is beyond buffer bounds\n");
+                break;
+            }
             memcpy(s->frame.data[0] + i*s->frame.linesize[0], buf, avctx->width*3);
             buf += stride;
+            buf_size -= stride;
         }
         break;
     case 1: