RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 4f4ad33d96)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-02-15 22:56:18 +01:00
parent 555d2ab5a5
commit 6a300f6a90
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.c
View File

@ -4242,7 +4242,8 @@ static int seek_to_start(InputFile *ifile, AVFormatContext *is)
ifile->time_base = ist->st->time_base; ifile->time_base = ist->st->time_base;
/* the total duration of the stream, max_pts - min_pts is /* the total duration of the stream, max_pts - min_pts is
* the duration of the stream without the last frame */ * 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 = duration_max(duration, &ifile->duration, ist->st->time_base,
ifile->time_base); ifile->time_base);
} }