summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-04-13 11:38:48 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-04-13 23:10:00 +0200
commitd4b5ffeb57f28196c263fa228019aa6d2956476a (patch)
tree33dc4d3a4f9a303505a84a67d4a653bb6eb77acd
parentb8ef20becf92cec9736eacb4c8cb2e9abfea6a3d (diff)
downloadffmpeg-d4b5ffeb57f28196c263fa228019aa6d2956476a.tar.gz
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>
-rw-r--r--libavformat/utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6da5838dbc..4df9ba5665 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1090,6 +1090,7 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index,
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;