diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-04-11 21:52:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-31 21:35:14 +0200 |
| commit | 14d8814edca862895fbf64187c32f2ac61afde90 (patch) | |
| tree | c3040f3b5738a379a6685e008273be669d21c0c2 | |
| parent | 54e0971edbd6cf783f6209d762514633f6d9d413 (diff) | |
| download | ffmpeg-14d8814edca862895fbf64187c32f2ac61afde90.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>
(cherry picked from commit 6007d5688c8b0efe5bb8489cca3a0e32b2001263)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/demux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/demux.c b/libavformat/demux.c index f895f0ba85..0aba11e70b 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1586,7 +1586,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); |