diff options
author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-12-31 16:55:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 16:00:31 +0100 |
commit | a7a7c6e44c403d64cdd2fd3e8f83b796274fe40e (patch) | |
tree | d3120d60fd81987204ca4d01b1684f8426a7ce47 /libavcodec/fdctdsp.c | |
parent | d41b91ba33a52f8deac4d2e35b698b360de5666c (diff) | |
download | ffmpeg-a7a7c6e44c403d64cdd2fd3e8f83b796274fe40e.tar.gz |
mjpegdec: extend check for incompatible values of s->rgb and s->ls
This can happen if s->ls changes from 0 to 1, but picture allocation is
skipped due to s->interlaced.
In that case ff_jpegls_decode_picture could be called even though the
s->picture_ptr frame has the wrong pixel format and thus a wrong
linesize, which results in a too small zero buffer being allocated.
This fixes an out-of-bounds read in ls_decode_line.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 7ea2db6eafa0a8a9497aab20be2cfc8742a59072)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/fdctdsp.c')
0 files changed, 0 insertions, 0 deletions