1. ffmpeg
  2. Commit 3389d479acef93f67eaf021e93ca9b962cbebc43
Browse code

avcodec/diracdec: Check component quant

Fixes: Timeout
Fixes: 10708/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5730140957442048

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 28c96c2ce2781c2cd147a9f3c299e18ce1dc7ff8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2018/11/14 17:42:44
Showing 1 changed files
libavcodec/diracdec.c
History View file @ 3389d47
... ... 
@@ -661,6 +661,10 @@ static void decode_component(DiracContext *s, int comp)
661 661 
             b->length = get_interleaved_ue_golomb(&s->gb);
662 662 
             if (b->length) {
663 663 
                 b->quant = get_interleaved_ue_golomb(&s->gb);
664 
+                if (b->quant > (DIRAC_MAX_QUANT_INDEX - 1)) {
665 
+                    av_log(s->avctx, AV_LOG_ERROR, "Unsupported quant %d\n", b->quant);
666 
+                    b->quant = 0;
667 
+                }
664 668 
                 align_get_bits(&s->gb);
665 669 
                 b->coeff_data = s->gb.buffer + get_bits_count(&s->gb)/8;
666 670 
                 b->length = FFMIN(b->length, FFMAX(get_bits_left(&s->gb)/8, 0));