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-14 17:32:51 +0200
commitd835d6cd089bd53116537d1987cb90db70504995 (patch)
tree6f8eecd6d18f3b96a1b9d0fa9bd3bbcc57fa5ac4
parent3c428a5ff7a229ae8e85a80e0a7f84e41ced2444 (diff)
downloadffmpeg-d835d6cd089bd53116537d1987cb90db70504995.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> (cherry picked from commit 62c5949beca2c95d6af5c74985467438d2295a66) 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 24fa168e36..97d3ae40ea 100644
--- a/libavcodec/cllc.c
+++ b/libavcodec/cllc.c
@@ -81,6 +81,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;
}