From patchwork Sat Sep 24 13:28:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 701 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1071902vsd; Sat, 24 Sep 2016 06:28:46 -0700 (PDT) X-Received: by 10.28.4.72 with SMTP id 69mr6763466wme.91.1474723726818; Sat, 24 Sep 2016 06:28:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i20si743413wmd.118.2016.09.24.06.28.46; Sat, 24 Sep 2016 06:28:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EE63689DEE; Sat, 24 Sep 2016 16:28:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BADAB689DD9 for ; Sat, 24 Sep 2016 16:28:21 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bnn0P-0007LS-MK for ffmpeg-devel@ffmpeg.org; Sat, 24 Sep 2016 15:28:37 +0200 Received: from [192.168.1.3] ([80.110.107.246]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id nRUc1t00H5Jzyoo01RUdtX; Sat, 24 Sep 2016 15:28:37 +0200 X-SourceIP: 80.110.107.246 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Sat, 24 Sep 2016 15:28:36 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201609241528.36266.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/utils: Do not overflow in update_initial_timestamps(). X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch hopefully fixes ticket #5136. Please review, Carl Eugen From 09a31f8f6584f0c97443fd6edc7fcf7142b6a6ff Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 24 Sep 2016 15:26:21 +0200 Subject: [PATCH] lavf/utils: Do not overflow in update_initial_timestamps(). Fixes ticket #5136. --- libavformat/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 93ea6ff..4362a12 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1069,7 +1069,9 @@ 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 || - is_relative(dts)) + is_relative(dts) || + INT64_MIN + RELATIVE_TS_BASE > st->cur_dts || + (dts > 0 ? INT64_MAX - dts < st->cur_dts - RELATIVE_TS_BASE : INT64_MIN - dts > st->cur_dts - RELATIVE_TS_BASE)) return; st->first_dts = dts - (st->cur_dts - RELATIVE_TS_BASE);