[FFmpeg-cvslog] avformat/utils: Fix integer overflow in discontinuity check
Michael Niedermayer
git at videolan.org
Sun Nov 18 04:02:01 EET 2018
ffmpeg | branch: release/3.2 | Michael Niedermayer <michael at niedermayer.cc> | Fri Oct 12 03:00:32 2018 +0200| [9181ecd2e60285136f77c655d87ec7538cdfded1] | committer: Michael Niedermayer
avformat/utils: Fix integer overflow in discontinuity check
Fixes: signed integer overflow: 7738135736989908991 - -7954308516317364223 cannot be represented in type 'long'
Fixes: find_stream_info_usan
Reported-by: Thomas Guilbert <tguilbert at google.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 4e19cfcfa3944fe4cf97bea758f72f104dcaebad)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9181ecd2e60285136f77c655d87ec7538cdfded1
---
libavformat/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index eda9220923..8cdad78659 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3600,7 +3600,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
* sequence, we treat it as a discontinuity. */
if (st->info->fps_last_dts != AV_NOPTS_VALUE &&
st->info->fps_last_dts_idx > st->info->fps_first_dts_idx &&
- (pkt->dts - st->info->fps_last_dts) / 1000 >
+ (pkt->dts - (uint64_t)st->info->fps_last_dts) / 1000 >
(st->info->fps_last_dts - (uint64_t)st->info->fps_first_dts) /
(st->info->fps_last_dts_idx - st->info->fps_first_dts_idx)) {
av_log(ic, AV_LOG_WARNING,
More information about the ffmpeg-cvslog
mailing list