Message ID | 20201111160102.19731-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | c6edbf009063275365362c343fdbd6d24c838e3f |
Headers | show |
Series | [FFmpeg-devel,1/3] avformat/utils: Use av_sat_sub64() in max_analyze_duration check | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
On Wed, Nov 11, 2020 at 05:01:00PM +0100, Michael Niedermayer wrote: > Fixes: signed integer overflow: 9223372036854710272 - -541165944832 cannot be represented in type 'long' > Fixes: 27000/clusterfuzz-testcase-minimized-ffmpeg_dem_IVF_fuzzer-5643670608674816 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/utils.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) will apply [...]
diff --git a/libavformat/utils.c b/libavformat/utils.c index 503e583ad0..f04ebd3f4f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3838,8 +3838,10 @@ FF_ENABLE_DEPRECATION_WARNINGS if ( t == 0 && st->codec_info_nb_frames>30 && st->internal->info->fps_first_dts != AV_NOPTS_VALUE - && st->internal->info->fps_last_dts != AV_NOPTS_VALUE) - t = FFMAX(t, av_rescale_q(st->internal->info->fps_last_dts - st->internal->info->fps_first_dts, st->time_base, AV_TIME_BASE_Q)); + && st->internal->info->fps_last_dts != AV_NOPTS_VALUE) { + int64_t dur = av_sat_sub64(st->internal->info->fps_last_dts, st->internal->info->fps_first_dts); + t = FFMAX(t, av_rescale_q(dur, st->time_base, AV_TIME_BASE_Q)); + } if (analyzed_all_streams) limit = max_analyze_duration; else if (avctx->codec_type == AVMEDIA_TYPE_SUBTITLE) limit = max_subtitle_analyze_duration;
Fixes: signed integer overflow: 9223372036854710272 - -541165944832 cannot be represented in type 'long' Fixes: 27000/clusterfuzz-testcase-minimized-ffmpeg_dem_IVF_fuzzer-5643670608674816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)