commit d4b5ffeb57f28196c263fa228019aa6d2956476a
author Michael Niedermayer <michael@niedermayer.cc> Fri Apr 13 11:38:48 2018 +0200
committer Michael Niedermayer <michael@niedermayer.cc> Fri Apr 13 23:10:00 2018 +0200
tree 33dc4d3a4f9a303505a84a67d4a653bb6eb77acd
parent b8ef20becf92cec9736eacb4c8cb2e9abfea6a3d

avformat/utils: Check cur_dts in update_initial_timestamps() more

Fixes: runtime error: signed integer overflow: 18133149658382192 - -9223090561878065151 cannot be represented in type 'long long'
Fixes: crbug 831552

Reported-by: Matt Wolenetz <wolenetz@google.com>
Reviewed-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 37d46dc21d708192b12aa13617ebe6a117b07363)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavformat/utils.c

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6da5838..4df9ba5 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1090,6 +1090,7 @@
     if (st->first_dts != AV_NOPTS_VALUE ||
         dts           == AV_NOPTS_VALUE ||
         st->cur_dts   == AV_NOPTS_VALUE ||
+        st->cur_dts < INT_MIN + RELATIVE_TS_BASE ||
         is_relative(dts))
         return;