diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 17:54:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 18:29:13 +0200 |
| commit | 9806028fbba5dc7a2af6dd5b0a08057180cccc79 (patch) | |
| tree | b97e520aeda7f2cac80ad609f9efee038b1c0c27 | |
| parent | 433e15bb873f7ba54d8895de7e74c43205551084 (diff) | |
| download | ffmpeg-9806028fbba5dc7a2af6dd5b0a08057180cccc79.tar.gz | |
avcodec/pngdec: Calculate MPNG bytewidth more defensively
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e830902934a29df05c7af65aef2a480b15f572c4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 faf938b36e..8f3da77a2a 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -851,10 +851,11 @@ exit_loop: int i, j; uint8_t *pd = p->data[0]; uint8_t *pd_last = s->last_picture.f->data[0]; + int ls = FFMIN(av_image_get_linesize(p->format, s->width, 0), s->width * s->bpp); ff_thread_await_progress(&s->last_picture, INT_MAX, 0); 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; pd_last += s->image_linesize; |