diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-02-15 22:56:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-19 17:17:35 +0200 |
| commit | 26e55785dda21a6399a915dcb43c3a942187e7e1 (patch) | |
| tree | 7dee1c740a5d089eaa13c89563cf8af3bf8712b9 | |
| parent | 0a565190a7bf9db3141d0f4b60c767b5e63442d2 (diff) | |
| download | ffmpeg-26e55785dda21a6399a915dcb43c3a942187e7e1.tar.gz | |
fftools/ffmpeg: Fix integer overflow in duration computation in seek_to_start()
Fixes: signed integer overflow: -9223372036854775808 - 9223372036854775807 cannot be represented in type 'long'
Fixes: Ticket8142
Found-by: Suhwan
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4f4ad33d96a01d82edf56d58599017cb0ae5bfa8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | fftools/ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f04103cf..fa016388e3 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4235,7 +4235,8 @@ static int seek_to_start(InputFile *ifile, AVFormatContext *is) ifile->time_base = ist->st->time_base; /* the total duration of the stream, max_pts - min_pts is * the duration of the stream without the last frame */ - duration += ist->max_pts - ist->min_pts; + if (ist->max_pts > ist->min_pts && ist->max_pts - (uint64_t)ist->min_pts < INT64_MAX - duration) + duration += ist->max_pts - ist->min_pts; ifile->time_base = duration_max(duration, &ifile->duration, ist->st->time_base, ifile->time_base); } |