aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-11-07 21:11:32 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-17 21:34:53 +0200
commit32d3a76d935806731348269bfeb14e1d0406d4cc (patch)
treed2ce9956b97ff1e20388320e57794cb02883e849
parent18775fa63c77adde8c91b2bf8a47b9b1388c7192 (diff)
downloadffmpeg-32d3a76d935806731348269bfeb14e1d0406d4cc.tar.gz
avformat/tedcaptionsdec: Check for overflow in parse_int()
Fixes: signed integer overflow: 1111111111111111111 * 10 cannot be represented in type 'long' Fixes: 26892/clusterfuzz-testcase-minimized-ffmpeg_dem_TEDCAPTIONS_fuzzer-5756045055754240 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b0f8586ca9853ab3d324ccd3c42bad4375000b0a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/tedcaptionsdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c
index d6020d9e35..3a3b238630 100644
--- a/libavformat/tedcaptionsdec.c
+++ b/libavformat/tedcaptionsdec.c
@@ -181,6 +181,8 @@ static int parse_int(AVIOContext *pb, int *cur_byte, int64_t *result)
if ((unsigned)*cur_byte - '0' > 9)
return AVERROR_INVALIDDATA;
while (BETWEEN(*cur_byte, '0', '9')) {
+ if (val > INT_MAX/10 - (*cur_byte - '0'))
+ return AVERROR_INVALIDDATA;
val = val * 10 + (*cur_byte - '0');
next_byte(pb, cur_byte);
}