1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00

avformat/concatdec: Clip duration in one more case in get_best_effort_duration()

Fixes: signed integer overflow: 40000 - -9223372036854770000 cannot be represented in type 'long'
Fixes: 427262541/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-4831506940100608

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-07-13 03:10:27 +02:00
parent 749aaf2744
commit 8cdb47e47a

View File

@ -326,7 +326,7 @@ static int64_t get_best_effort_duration(ConcatFile *file, AVFormatContext *avf)
if (file->outpoint != AV_NOPTS_VALUE) if (file->outpoint != AV_NOPTS_VALUE)
return av_sat_sub64(file->outpoint, file->file_inpoint); return av_sat_sub64(file->outpoint, file->file_inpoint);
if (avf->duration > 0) if (avf->duration > 0)
return avf->duration - (file->file_inpoint - file->file_start_time); return av_sat_sub64(avf->duration, file->file_inpoint - file->file_start_time);
if (file->next_dts != AV_NOPTS_VALUE) if (file->next_dts != AV_NOPTS_VALUE)
return file->next_dts - file->file_inpoint; return file->next_dts - file->file_inpoint;
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;