aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-10 18:26:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-15 12:25:46 +0100
commit34905f72198b59f4a2bb2f54c24d5c04b7414828 (patch)
treed56cb48e196300376948974ea0ebeb2e4497cdfb
parent5577079473003d0bc1e283197fd6f852b5491bce (diff)
downloadffmpeg-34905f72198b59f4a2bb2f54c24d5c04b7414828.tar.gz
avcodec/qdmc: Check input space in qdmc_get_vlc()
Fixes: Timeout (125sec -> 0.4sec) Fixes: 18059/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDMC_fuzzer-5656195825664000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2c7975fe6f5c734fce9c59e8418c7f2de15a558d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/qdmc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qdmc.c b/libavcodec/qdmc.c
index f4d63cd8b8..b5e015f9bf 100644
--- a/libavcodec/qdmc.c
+++ b/libavcodec/qdmc.c
@@ -361,6 +361,8 @@ static int qdmc_get_vlc(GetBitContext *gb, VLC *table, int flag)
{
int v;
+ if (get_bits_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
v = get_vlc2(gb, table->table, table->bits, 1);
if (v < 0)
return AVERROR_INVALIDDATA;