aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-04-11 21:52:55 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-04-21 22:42:20 +0200
commit6007d5688c8b0efe5bb8489cca3a0e32b2001263 (patch)
tree64de55ab25429bf68a3c635453ad19d709b33af8
parent83e1a1de8833845224948e5d002355c03dd117d5 (diff)
downloadffmpeg-6007d5688c8b0efe5bb8489cca3a0e32b2001263.tar.gz
avformat/demux: Use unsigned to check duration vs duration_text
Fixes: signed integer overflow: 9223371898743775808 - -138111000000 cannot be represented in type 'long' Fixes: 46245/clusterfuzz-testcase-minimized-ffmpeg_dem_OGG_fuzzer-5075129786302464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/demux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/demux.c b/libavformat/demux.c
index ef189d9d8e..ad7b5dbf83 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1612,7 +1612,7 @@ static void update_stream_timings(AVFormatContext *ic)
else if (end_time < end_time_text)
av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream endtime %f\n", end_time_text / (float)AV_TIME_BASE);
- if (duration == INT64_MIN || (duration < duration_text && duration_text - duration < AV_TIME_BASE))
+ if (duration == INT64_MIN || (duration < duration_text && (uint64_t)duration_text - duration < AV_TIME_BASE))
duration = duration_text;
else if (duration < duration_text)
av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream duration %f\n", duration_text / (float)AV_TIME_BASE);