git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cf42f6
)
avcodec/aic: Check remaining bits in aic_decode_coeffs()
author
Michael Niedermayer
<michael@niedermayer.cc>
Mon, 25 Feb 2019 12:26:25 +0000
(13:26 +0100)
committer
Michael 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
patch
|
blob
|
history
diff --git
a/libavcodec/aic.c
b/libavcodec/aic.c
index
9c6f806
..
dc28c83
100644
(file)
--- a/
libavcodec/aic.c
+++ b/
libavcodec/aic.c
@@
-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);