aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-01-19 21:51:11 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-02-03 00:11:18 +0100
commitbe54da2117a6f58c14283f2511e71fda8d3bfe9d (patch)
treec43b0ba56fd35004ea8a17e3c6317aa3b770177d
parent53aa76686e7ff4f1f6625502503d7923cec8c10e (diff)
downloadffmpeg-be54da2117a6f58c14283f2511e71fda8d3bfe9d.tar.gz
avcodec/snappy: Sanity check bytestream2_get_levarint()
Fixes: left shift of 79 by 28 places cannot be represented in type 'int' Fixes: 20202/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HAP_fuzzer-5719004081815552 Fixes: 20219/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HAP_fuzzer-5641738677125120 Fixes: 20389/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HAP_fuzzer-5680721517871104 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/snappy.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/snappy.c b/libavcodec/snappy.c
index 7900b0f978..f5c4c6578b 100644
--- a/libavcodec/snappy.c
+++ b/libavcodec/snappy.c
@@ -39,6 +39,8 @@ static int64_t bytestream2_get_levarint(GetByteContext *gb)
do {
tmp = bytestream2_get_byte(gb);
+ if (shift > 31 || ((tmp & 127LL) << shift) > INT_MAX)
+ return AVERROR_INVALIDDATA;
val |= (tmp & 127) << shift;
shift += 7;
} while (tmp & 128);