]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/apedec: Set error on error in ape_decode_value_3860()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 18 Nov 2019 07:51:20 +0000 (08:51 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Dec 2019 00:01:22 +0000 (01:01 +0100)
Fixes: Timeout (unknown -> 15sec)
Fixes: 18808/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5677586072207360
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/apedec.c

index f87131ab4ff413eb96cb115fcdb1ea685182ab63..1b23e541531147f264f38e73991a7ee1ca82b433 100644 (file)
@@ -496,6 +496,7 @@ static inline int ape_decode_value_3860(APEContext *ctx, GetBitContext *gb,
         x = (overflow << rice->k) + get_bits(gb, rice->k);
     } else {
         av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %"PRIu32"\n", rice->k);
+        ctx->error = 1;
         return AVERROR_INVALIDDATA;
     }
     rice->ksum += x - (rice->ksum + 8 >> 4);