aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-09 19:38:46 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-09 19:39:43 +0200
commit62c5949beca2c95d6af5c74985467438d2295a66 (patch)
treec171867e20cb292c15aa25dac6aef3a5d989dec6
parent72810d20b74f05cc4b214d6c277fa6f43160df54 (diff)
downloadffmpeg-62c5949beca2c95d6af5c74985467438d2295a66.tar.gz
avcodec/cllc: Check prefix
Fixes: runtime error: left shift of 1610706944 by 1 places cannot be represented in type 'int' Fixes: 1421/clusterfuzz-testcase-minimized-6239947507892224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/cllc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c
index e0895d2e1f..77de6e71c7 100644
--- a/libavcodec/cllc.c
+++ b/libavcodec/cllc.c
@@ -71,6 +71,10 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc)
count++;
}
+ if (prefix > (65535 - 256)/2) {
+ vlc->table = NULL;
+ return AVERROR_INVALIDDATA;
+ }
prefix <<= 1;
}