]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/aic: Check remaining bits in aic_decode_coeffs()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 25 Feb 2019 12:26:25 +0000 (13:26 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 3 Mar 2019 12:17:02 +0000 (13:17 +0100)
Fixes: Timeout (78 seconds -> 2 seconds)
Fixes: 13186/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AIC_fuzzer-5639516533030912
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/aic.c

index 9c6f806655e3e19149e6a71d890ba4cc73bfd20a..dc28c83661e0270c65cac5a25132e55a5eaa60c4 100644 (file)
@@ -208,6 +208,9 @@ static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst,
     int mb, idx;
     unsigned val;
 
+    if (get_bits_left(gb) < 5)
+        return AVERROR_INVALIDDATA;
+
     has_skips  = get_bits1(gb);
     coeff_type = get_bits1(gb);
     coeff_bits = get_bits(gb, 3);