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 12:30:40 +0100 |
commit | 83c0df90b0a011fcdcec031433b1d2da97d45ae8 (patch) | |
tree | ee0475cf4d76df20f591b37af8b93cafc7c69e47 /libavcodec/x86/videodsp_init.c | |
parent | 0a6324fe9315e2a7dc5a5fe377f54ff17056f74c (diff) | |
download | ffmpeg-83c0df90b0a011fcdcec031433b1d2da97d45ae8.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/x86/videodsp_init.c')
0 files changed, 0 insertions, 0 deletions