avcodec/mjpegdec: check bits per pixel for changes similar to dimensions
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Oct 2014 23:50:27 +0000 (01:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 23:47:04 +0000 (00:47 +0100)
commitb5e661bcd2bb4fe771cb2c1e21215c68e6a17665
tree7a76412cfb0042162921cfc3ad36e25fa431ae2a
parent794fcabfe8b8506dbdf33a735318d1a2aecfb150
avcodec/mjpegdec: check bits per pixel for changes similar to dimensions

Fixes out of array accesses
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c378d6a6df8243f06c87962b873bd563e58cd39)

Conflicts:

libavcodec/mjpegdec.c
(cherry picked from commit 94371a404c663c3dae3d542fa43951567ab67f82)

Conflicts:

libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c