diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 17:54:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:48 +0100 |
commit | 677da723005e0a40e4ab88cec7c001fbfc65955a (patch) | |
tree | a73ca86849aa7d78c5b27d08335dd89898ac6090 | |
parent | 7238c744de4254973d3b04550c5764fd6bfc8267 (diff) | |
download | ffmpeg-677da723005e0a40e4ab88cec7c001fbfc65955a.tar.gz |
avcodec/pngdec: Calculate MPNG bytewidth more defensively
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e830902934a29df05c7af65aef2a480b15f572c4)
Conflicts:
libavcodec/pngdec.c
-rw-r--r-- | libavcodec/pngdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 80631f7b51..15b48c372c 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -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; |