avcodec/pngdec: Calculate MPNG bytewidth more defensively
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 15:54:21 +0000 (17:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 17:03:48 +0000 (18:03 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e830902934a29df05c7af65aef2a480b15f572c4)

Conflicts:

libavcodec/pngdec.c

libavcodec/pngdec.c

index 80631f7..15b48c3 100644 (file)
@@ -650,9 +650,10 @@ static int decode_frame(AVCodecContext *avctx,
             int i, j;
             uint8_t *pd = s->current_picture->data[0];
             uint8_t *pd_last = s->last_picture->data[0];
+            int ls = FFMIN(av_image_get_linesize(s->current_picture->format, s->width, 0), s->width * s->bpp);
 
             for(j=0; j < s->height; j++) {
-                for(i=0; i < s->width * s->bpp; i++) {
+                for(i=0; i < ls; i++) {
                     pd[i] += pd_last[i];
                 }
                 pd += s->image_linesize;