aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-27 20:53:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-09 13:54:52 +0200
commit55922a70d9fc074ac143842e19e93ee63b7cb8bd (patch)
tree4d744e96df26849aa9fa3ed03a79e738ad584b30
parentd92939f984ccd28f361599c6f8ebe80f0c41a7fa (diff)
downloadffmpeg-55922a70d9fc074ac143842e19e93ee63b7cb8bd.tar.gz
avformat/sbgdec: Check for overflow in timestamp preparation
Fixes: signed integer overflow: 9223372036854775807 + 86400000000 cannot be represented in type 'long' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-6731040263634944 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 9dbed908403b0d97ae70881fab68020f148b6b11) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/sbgdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index 646c141ab4..586a0c58f8 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -1281,6 +1281,10 @@ static int generate_intervals(void *log, struct sbg_script *s, int sample_rate,
ev1 = &s->events[i];
ev2 = &s->events[(i + 1) % s->nb_events];
ev1->ts_int = ev1->ts;
+
+ if (!ev1->fade.slide && ev1 >= ev2 && ev2->ts > INT64_MAX - period)
+ return AVERROR_INVALIDDATA;
+
ev1->ts_trans = ev1->fade.slide ? ev1->ts
: ev2->ts + (ev1 < ev2 ? 0 : period);
}