aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-04-13 11:38:48 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-07-10 01:52:55 +0200
commit25ecdac8beca8978ff09da97dbd5e1bda9675253 (patch)
treecc992aa70f8dae5c01c1c073c159c0c640769f9c
parent9af1e014f788a9c8700c4415130475f27a35e3db (diff)
downloadffmpeg-25ecdac8beca8978ff09da97dbd5e1bda9675253.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 a658eb22c0..33a4aade64 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -894,6 +894,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;