aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-31 16:55:43 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-01-28 02:15:49 +0100
commit46fcc2ba55df8ac2475d6977e8e220fcd5e5f169 (patch)
treed8697a1b9f7d9650ae057e7ec75eff24338e672a /cmdutils.c
parenta2667c60ecc3f1f037d996dc2ce8422dbef2e57b (diff)
downloadffmpeg-46fcc2ba55df8ac2475d6977e8e220fcd5e5f169.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: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions