Commit 0f31d401 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/mjpegdec: Fix decoding images with Adobe_CM tag.

Fixes ticket #5267.
parent 03af008e
......@@ -1677,7 +1677,11 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
goto out;
}
if (id == AV_RB32("Adob") && (get_bits(&s->gb, 8) == 'e')) {
if ( id == AV_RB32("Adob")
&& len >= 7
&& show_bits(&s->gb, 8) == 'e'
&& show_bits_long(&s->gb, 32) != AV_RB32("e_CM")) {
skip_bits(&s->gb, 8); /* 'e' */
skip_bits(&s->gb, 16); /* version */
skip_bits(&s->gb, 16); /* flags0 */
skip_bits(&s->gb, 16); /* flags1 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment