From patchwork Thu Jun 10 13:58:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp541551iol; Thu, 10 Jun 2021 07:07:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9azwXfw+SV5j57uOd4XbOKXmeJNt26epUet/bCWunCDwtq2QOYESw82/Oq3nLMRBS38HD X-Received: by 2002:a17:906:fcb5:: with SMTP id qw21mr4578013ejb.57.1623334069361; Thu, 10 Jun 2021 07:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623334069; cv=none; d=google.com; s=arc-20160816; b=eZlVgVogtEogvbbI6ryXHCUoet3K8PtAI2ZMzTueboE7uYPfr/rLxej9Go10dE+6wY ZweTL7S6MPi2EsqA30HVMK7zyZ+LhU+S0mrEPu28NLdYthR53c9uRQ1RLN2mLlOgHX8E FK1rUVgNl81qM3pjoEG3kh2bQaSPFYMJjajhRMn/VYTECTWB7a2WyojqUxHBeyCj29aJ Cd7CuAvgID/8aRus/le3O0AXeQJeO146DvmxRklj5fqNvvVu5R0fiCcoEt7svPprEUcj 1hzHtXGON5XNbogjJMF18z9hU+9+ucYGIeW8WlAICxYBV18gxBNrgo/OC8qpTeUPyRs5 RMRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=l0UjduHThMWCGnypbW1LGz7bLx1tQ4oP2Oi0K3XLoZg=; b=qPCzjmFSNcXwtwXxCYFk+zMpJVk9fzsKoKstT5jBBfWKrf4Fn1dUs/dYP7bvum6Wq0 CuFBJ7008AFR7Oz5c7OFzjl7TI3cmM8fBM7pb/ER7OkCCAYedKRBW08SzBPKnVL5PBKB Rg193OI2duwMg1z7bk4lC6BsUNisFqL8abyJLAq87+oXV4YnFmWB25Pec5QMBeKoQnCv 0TRqXTKfffGg3p4jV4LD/DkxpwtKO5U9bXq0E/iaQvidRs3TzumueAb/mvlJO30WAS4R WlRczefv3Jk/MOB+F/UOAfN/W0excFEqsAbe2i4XeHAaly6NwsNATiKsYWXZgtdjY51F zfZQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d12si2898286ejj.130.2021.06.10.07.07.48; Thu, 10 Jun 2021 07:07:49 -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 41F27687F19; Thu, 10 Jun 2021 17:07:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 593036809E6 for ; Thu, 10 Jun 2021 17:07:40 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lrLDE-00GGuA-0F for ffmpeg-devel@ffmpeg.org; Thu, 10 Jun 2021 15:59:12 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rLCFlWurXljeHrLCFlEfy5; Thu, 10 Jun 2021 15:58:12 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=iOEUGmBRcNTOwCozQ_0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 10 Jun 2021 15:58:09 +0200 Message-Id: <20210610135811.21320-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCGYLHY1Pl3SYaH7jy7mLVgcvFneiG5bO1hpYYL/D+VJ+Lg4lfM3EhAW6c+lFg7xKXI8OEnGHD9Ebng0I7a7RrUgEaVumo+nsXjGPq7j9t6pAPrK44dh PYfaY3xqN9Klu1NBKpT9DsndwYvAAv9fJf8PjAWMqycQ89fagVITqvNc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/utils: Avoid overflow in codec_info_duration computation for subtitles X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kyqb8bhw4kjC Fixes: signed integer overflow: 9223126845747118112 - -2594073385365397472 cannot be represented in type 'long' Fixes: 34936/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-6739888002170880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0fc55c8da2..0c64a7c6fb 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3843,7 +3843,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) break; } if (pkt->duration) { - if (avctx->codec_type == AVMEDIA_TYPE_SUBTITLE && pkt->pts != AV_NOPTS_VALUE && st->start_time != AV_NOPTS_VALUE && pkt->pts >= st->start_time) { + if (avctx->codec_type == AVMEDIA_TYPE_SUBTITLE && pkt->pts != AV_NOPTS_VALUE && st->start_time != AV_NOPTS_VALUE && pkt->pts >= st->start_time + && (uint64_t)pkt->pts - st->start_time < INT64_MAX + ) { st->internal->info->codec_info_duration = FFMIN(pkt->pts - st->start_time, st->internal->info->codec_info_duration + pkt->duration); } else st->internal->info->codec_info_duration += pkt->duration;