aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-10-20 22:10:39 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-10-25 09:49:21 +0100
commitac8cebd48e405e6f610fc8e61f070f1258b73017 (patch)
treefd2651208b6f7ee01b8f330a3c604acfd6c87ffc
parent6939174bfc1b84a74b79764484fb33140727c2f5 (diff)
downloadffmpeg-ac8cebd48e405e6f610fc8e61f070f1258b73017.tar.gz
avutil/mathematics: Use av_sat_add64() for the last addition in av_add_stable()
Fixes: signed integer overflow: 9223372036854770375 + 5450 cannot be represented in type 'long' Fixes: 26471/clusterfuzz-testcase-minimized-ffmpeg_dem_MXG_fuzzer-6229617557635072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavutil/mathematics.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index 16c6e4db03..da0fc17b2e 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -210,6 +210,6 @@ int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t i
if (old == INT64_MAX || old == AV_NOPTS_VALUE || old_ts == AV_NOPTS_VALUE)
return ts;
- return av_rescale_q(old + 1, inc_tb, ts_tb) + (ts - old_ts);
+ return av_sat_add64(av_rescale_q(old + 1, inc_tb, ts_tb), ts - old_ts);
}
}