summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-18 22:39:30 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-06-12 14:22:42 +0200
commitbf4e7ec8257fd24a12327c7fa14e322028250be4 (patch)
treee960ad8cbb8cd24b7642dcad91ceefaad99b5f76
parent3447979d08d701581a65f7275425cb1a59302319 (diff)
avformat/utils: check dts/duration to be representable before using them
Fixes: signed integer overflow: 6854513951393103890 + 3427256975738527712 cannot be represented in type 'long' Fixes: 32936/clusterfuzz-testcase-minimized-ffmpeg_dem_R3D_fuzzer-5236914752978944 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--libavformat/utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5582d108d0..ac150406ff 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1157,7 +1157,9 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st,
(pktl->pkt.dts == AV_NOPTS_VALUE ||
pktl->pkt.dts == st->internal->first_dts ||
pktl->pkt.dts == RELATIVE_TS_BASE) &&
- !pktl->pkt.duration) {
+ !pktl->pkt.duration &&
+ av_sat_add64(cur_dts, duration) == cur_dts + (uint64_t)duration
+ ) {
pktl->pkt.dts = cur_dts;
if (!st->internal->avctx->has_b_frames)
pktl->pkt.pts = cur_dts;