diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 01:50:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 02:30:00 +0200 |
commit | 0ffa44340f247e5d24d006726ecc9c66c55dcf22 (patch) | |
tree | 7223820a0082596a5786dd221da33d549bad2721 /libavcodec/pnmdec.c | |
parent | 0bd9b78fb6c4831cfffe368989583b337bdacca6 (diff) | |
download | ffmpeg-0ffa44340f247e5d24d006726ecc9c66c55dcf22.tar.gz |
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
Diffstat (limited to 'libavcodec/pnmdec.c')
0 files changed, 0 insertions, 0 deletions