avcodec/mjpegdec: Fix context fields becoming inconsistent
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 12:53:06 +0000 (13:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:40:35 +0000 (04:40 +0100)
commit07b98ea3963f1bf4a94b6adce540af90e767d881
tree5a42d3fc30bc7d4c0fb680959dfb9cde0a27deab
parentb4f08f34a852a52a6cf11b490e7a66357132abb6
avcodec/mjpegdec: Fix context fields becoming inconsistent

Fixes out of array access
Fixes: asan_heap-oob_1ca4f85_2760_cov_144449187_miss_congeniality_pegasus_ljpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0eecf40935b22644e6cd74c586057237ecfd6844)

Conflicts:

libavcodec/mjpegdec.c
libavcodec/mjpegdec.c