avformat/utils: Fix integer overflow in end time calculation in update_stream_timings()
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 11 Apr 2018 16:55:57 +0000 (18:55 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 13 Apr 2018 19:46:16 +0000 (21:46 +0200)
Fixes: crbug 829153

Reported-by: Matt Wolenetz <wolenetz@google.com>
Reviewed-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/utils.c

index 84b926d..69f9653 100644 (file)
@@ -2648,7 +2648,7 @@ static void update_stream_timings(AVFormatContext *ic)
     else if (start_time > start_time_text)
         av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE);
 
-    if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - end_time < AV_TIME_BASE)) {
+    if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - (uint64_t)end_time < AV_TIME_BASE)) {
         end_time = end_time_text;
     } else if (end_time < end_time_text) {
         av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream endtime %f\n", end_time_text / (float)AV_TIME_BASE);