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)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 15 Jan 2016 15:00:31 +0000 (16:00 +0100)
commita7a7c6e44c403d64cdd2fd3e8f83b796274fe40e
treed3120d60fd81987204ca4d01b1684f8426a7ce47
parentd41b91ba33a52f8deac4d2e35b698b360de5666c
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>
libavcodec/mjpegdec.c