diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-06-21 12:24:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 01:47:57 +0200 |
| commit | 6fe28832a9640d68ebc103cc689af5e2bffacbf4 (patch) | |
| tree | 80b67a851bd1da6d5c838cbd6154f03528f763ca | |
| parent | 3ea2cfe1620e8d9f307504ceb8825fbc9ab1a917 (diff) | |
| download | ffmpeg-6fe28832a9640d68ebc103cc689af5e2bffacbf4.tar.gz | |
avformat/utils: reorder duration computation to avoid overflow
Fixes: signed integer overflow: 8 * 9223372036854774783 cannot be represented in type 'long'
Fixes: 23381/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4818340509122560
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 10cc82c35baabbb07ffec3faccb04d8928c39e4c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 73cdb3383c..a68d149022 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2783,7 +2783,7 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) st = ic->streams[i]; if ( st->time_base.num <= INT64_MAX / ic->bit_rate && st->duration == AV_NOPTS_VALUE) { - duration = av_rescale(8 * filesize, st->time_base.den, + duration = av_rescale(filesize, 8LL * st->time_base.den, ic->bit_rate * (int64_t) st->time_base.num); st->duration = duration; |