From patchwork Tue Nov 8 18:47:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1344 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1842439vsb; Tue, 8 Nov 2016 10:47:14 -0800 (PST) X-Received: by 10.194.102.100 with SMTP id fn4mr11520053wjb.199.1478630834152; Tue, 08 Nov 2016 10:47:14 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n133si17995629wmg.73.2016.11.08.10.47.13; Tue, 08 Nov 2016 10:47:14 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4D44689D93; Tue, 8 Nov 2016 20:47:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30CEF689CCD for ; Tue, 8 Nov 2016 20:47:01 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id c17so24388395wmc.3 for ; Tue, 08 Nov 2016 10:47:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to; bh=oXJYoMrbvix5L93cGR7aexNrF+RvRdmQ2Gm9pldxup4=; b=iOb0i2EEQHrX3NEmZye1mD+TD4k4734z2AIHlSFLarPVzEf70HeanIOg98ndeZwhxx bEytbxQ9EoMf/UeH5jWiohM/LW7hGjWW1UijD2/8sY1H6izRlDFHvT3d97xQTiTBNt93 909FbgNsKLj7HFLbXlTw5/lOJUcupiEZV2L5lzEPWH7PrQJd9DE7JQnnflqJQqeApyVz I7z1Hsqb2nOPKBNClJSCs2VWawUE9VrQE9PxnuBzRNg/LqrFocEE99X57eK/bwRkhf5E 4vTNQ+GMhfhDBHR2a0cYVw9Q/e4r28aA7uAUOVaDLmHBOyc+wY8Sj5vmUsHuxE1WUtmQ ViJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to; bh=oXJYoMrbvix5L93cGR7aexNrF+RvRdmQ2Gm9pldxup4=; b=dbG5Sp6/16UondD0mDWh4eHXFA/Ga9JFcynypkMTXLQRZpM4+hMP3DUYIjn9lrVyLq 3ndE+5LDtrxL/LpW1BGxxtJckF/tGGE/wtLNOcp6e53/KPkxnX3ZKMwKI+aunDtKF2gQ 7Tk3S+VVu3iOE0VPcfRKbR6dKPV5cMLng69M7lXaYSK+WkNtiZkzVGdHXDqlFPPjkILs 4U7OXQ+5KFSslMg3a4c/6qsl+8rA7jnzY+Z2ZcAdQDzPqq/1Y3sOHSBwr7olMyvhBNhU xpYkmkZMYcCqANPDGCgKLJE13xTyzxzX6r0AJ66Wnx4kColoIBeyJOqUmcYouNXERzOw F0ZA== X-Gm-Message-State: ABUngveRkaLu/OCsUn4ad8cy601oNPoNbbtMmg0syTIm2k9L7jnC7rwbqyk6zRIVqzVyQQ== X-Received: by 10.194.243.106 with SMTP id wx10mr907335wjc.191.1478630824233; Tue, 08 Nov 2016 10:47:04 -0800 (PST) Received: from [192.168.2.21] (pD9E8FF48.dip0.t-ipconnect.de. [217.232.255.72]) by smtp.googlemail.com with ESMTPSA id wn5sm38480166wjb.42.2016.11.08.10.47.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 10:47:03 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: ffmpeg-devel@ffmpeg.org, libav development References: <20161107235407.GG4602@nb4> Message-ID: <0cf22af6-5e88-8e78-1229-22b04824874a@googlemail.com> Date: Tue, 8 Nov 2016 19:47:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161107235407.GG4602@nb4> Subject: Re: [FFmpeg-devel] [PATCH] mpegts: prevent division by zero 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" On 08.11.2016 00:54, Michael Niedermayer wrote: > On Mon, Nov 07, 2016 at 11:49:52PM +0100, Andreas Cadhalpun wrote: >> Signed-off-by: Andreas Cadhalpun >> --- >> libavformat/mpegts.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c >> index fad10c6..77d63f2 100644 >> --- a/libavformat/mpegts.c >> +++ b/libavformat/mpegts.c >> @@ -2692,6 +2692,10 @@ static int mpegts_read_header(AVFormatContext *s) >> /* NOTE1: the bitrate is computed without the FEC */ >> /* NOTE2: it is only the bitrate of the start of the stream */ >> ts->pcr_incr = (pcrs[1] - pcrs[0]) / (packet_count[1] - packet_count[0]); >> + if (ts->pcr_incr <= 0) { >> + av_log(s, AV_LOG_ERROR, "invalid pcr increment %d\n", ts->pcr_incr); >> + return AVERROR_INVALIDDATA; >> + } > > if a pcr pair is bad i would suggest to run the loop by another > iteration That's a good idea. New patch attached. Best regards, Andreas From 9d7a34dbdd9a5b97c9b51c47f918df7237b42fa6 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Mon, 7 Nov 2016 23:37:59 +0100 Subject: [PATCH] mpegts: prevent division by zero Signed-off-by: Andreas Cadhalpun --- libavformat/mpegts.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index fad10c6..048073b 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2681,8 +2681,16 @@ static int mpegts_read_header(AVFormatContext *s) packet_count[nb_pcrs] = nb_packets; pcrs[nb_pcrs] = pcr_h * 300 + pcr_l; nb_pcrs++; - if (nb_pcrs >= 2) - break; + if (nb_pcrs >= 2) { + if (pcrs[1] - pcrs[0] > 0) { + /* the difference needs to be positive to make sense for bitrate computation */ + break; + } else { + pcrs[0] = pcrs[1]; + packet_count[0] = packet_count[1]; + nb_pcrs--; + } + } } else { finished_reading_packet(s, ts->raw_packet_size); } -- 2.10.2