]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/diracdec: Check component quant
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 14 Nov 2018 08:42:44 +0000 (09:42 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 27 Nov 2018 13:38:03 +0000 (14:38 +0100)
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>
libavcodec/diracdec.c

index af561d142652681cf5c958ab7a362a0cc5da45c5..fd2313906219c3852b115530e37913026da55c13 100644 (file)
@@ -676,6 +676,11 @@ static int decode_component(DiracContext *s, int comp)
             b->length = get_interleaved_ue_golomb(&s->gb);
             if (b->length) {
                 b->quant = get_interleaved_ue_golomb(&s->gb);
+                if (b->quant > (DIRAC_MAX_QUANT_INDEX - 1)) {
+                    av_log(s->avctx, AV_LOG_ERROR, "Unsupported quant %d\n", b->quant);
+                    b->quant = 0;
+                    return AVERROR_INVALIDDATA;
+                }
                 align_get_bits(&s->gb);
                 b->coeff_data = s->gb.buffer + get_bits_count(&s->gb)/8;
                 b->length = FFMIN(b->length, FFMAX(get_bits_left(&s->gb)/8, 0));