aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-20 17:40:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-06 14:41:41 +0200
commit8c2ba2061275ce4a4c6ea0a249d0493b69a61f37 (patch)
tree09fd81ebec6601150fc568b9cf9f622e0cf4b328
parent3a5dc113efbe21739c5d2c3fda92eac70a5cef79 (diff)
downloadffmpeg-8c2ba2061275ce4a4c6ea0a249d0493b69a61f37.tar.gz
avformat/mov: Avoid undefined overflow in time_offset calculation
Fixes: signed integer overflow: 8511838621821575200 - -3954125146725285889 cannot be represented in type 'long' Fixes: 33414/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6610119325515776 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 7666d588ba1af26ce479e7fb92f7dc5b3a2ca48e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mov.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index e8d0651ef8..e6208a6550 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3822,7 +3822,11 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
if ((empty_duration || start_time) && mov->time_scale > 0) {
if (empty_duration)
empty_duration = av_rescale(empty_duration, sc->time_scale, mov->time_scale);
- sc->time_offset = start_time - empty_duration;
+
+ if (av_sat_sub64(start_time, empty_duration) != start_time - (uint64_t)empty_duration)
+ av_log(mov->fc, AV_LOG_WARNING, "start_time - empty_duration is not representable\n");
+
+ sc->time_offset = start_time - (uint64_t)empty_duration;
sc->min_corrected_pts = start_time;
if (!mov->advanced_editlist)
current_dts = -sc->time_offset;