mjpegdec: extend check for incompatible values of s->rgb and s->ls
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Thu, 31 Dec 2015 15:55:43 +0000 (16:55 +0100)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Thu, 31 Dec 2015 16:30:25 +0000 (17:30 +0100)
commit7ea2db6eafa0a8a9497aab20be2cfc8742a59072
tree0fba031cfd3cbf3c6c5187e3ef07b38aec0f5c85
parent3f8564fe3c68a29a137ada2400bd9dcd3928bfb1
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>
libavcodec/mjpegdec.c