highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/sbgdec: Check opt_duration and start for overflow

Browse Source 
Fixes: signed integer overflow: 2788626175500000000 + 7118941284000000000 cannot be represented in type 'long'
Fixes: 35215/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-6123272247836672

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 2768928624793f66694f7f2b0824f052e69e3557)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-06-24 18:57:51 +02:00
parent bd947157eb
commit 953f316b1b
1 changed files with 3 additions and 0 deletions

3
libavformat/sbgdec.c

@ -933,6 +933,9 @@ static int expand_timestamps(void *log, struct sbg_script *s)
}
if (s->start_ts == AV_NOPTS_VALUE)
s->start_ts = (s->opt_start_at_first && s->tseq) ? s->tseq[0].ts.t : now;
if (s->start_ts > INT64_MAX - s->opt_duration)
return AVERROR_INVALIDDATA;
s->end_ts = s->opt_duration ? s->start_ts + s->opt_duration :
AV_NOPTS_VALUE; /* may be overridden later by -E option */
cur_ts = now;