diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-03 23:02:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-05 23:19:39 +0200 |
commit | e075bc192da554b252a4a7d22c159a307724ee83 (patch) | |
tree | 71cd08f7c7782252ede9d191d79a3c71c32fac56 | |
parent | d482bf35eb10393bd91c9bd447e839fffd84a1d8 (diff) | |
download | ffmpeg-e075bc192da554b252a4a7d22c159a307724ee83.tar.gz |
avformat/utils: Ignore negative duration in codec_info_duration computation
Fixes: signed integer overflow: -5994697211974418462 + -3255307777713450286 cannot be represented in type 'long'
Fixes: 35332/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-5868035117285376
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4d81550df9580b454d2530bcb37de20b8354ad6e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 20a597a60a..75e5350a27 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3914,7 +3914,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_packet_unref(pkt1); break; } - if (pkt->duration) { + if (pkt->duration > 0) { if (avctx->codec_type == AVMEDIA_TYPE_SUBTITLE && pkt->pts != AV_NOPTS_VALUE && st->start_time != AV_NOPTS_VALUE && pkt->pts >= st->start_time && (uint64_t)pkt->pts - st->start_time < INT64_MAX ) { |