From patchwork Sun Mar 20 13:47:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp921155nkc; Sun, 20 Mar 2022 06:48:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA+0z/FWnU+UvyEvUF4XLl6RqVzI2zC4pB91ozMg83Luc1fLgyVZ7hCSz00tzVUknwT6Gk X-Received: by 2002:a50:ec0c:0:b0:418:f415:6bfe with SMTP id g12-20020a50ec0c000000b00418f4156bfemr18450334edr.15.1647784107887; Sun, 20 Mar 2022 06:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647784107; cv=none; d=google.com; s=arc-20160816; b=rTd2cGGa0ViZrElap71fS+9gfMmVxtQFvETkeBVjj+t4g7fzE9+lDHMQQGI1UkBEYb Yfk6yGV63lwJC/WT4ynPX+Kb4kCuHRC96A0+TP6F/WqOmtCIaiOcvbXQ1MJBut0Oelbz JNmGShsex6VxRc98aZOpllS+dVXBVEnUVTZ54715LMHV81MpYeW4khiZwGs5L8XT7Bi5 s6apOmEP1d+4tD+QGBS3EUKwOlPBL8pYWP/ck9PiXIfvJJGHbC24J30Zx3Ka1NHR6BWY lhzFP/p82iHLs3f9/viheTxW8tPNAvfgPfPuFtcs9+KF8z0qwDr0pu9BomelpR85xmpz H7EA== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=bLXcVx2SyRNEiuZRxvP1xRf2XhoRrPghPhzbqoHZJ/E=; b=HRV4aV9ndju+10eklPBLt4UU2Y5ZpQ0qXz0g5p3qtPrZNoXGavi0WFOzS7i0GBScOX 0czkwh7uZhRiPfV5immbB7IEqSKp3TEmo6cvLVshP4DGJwFu2oLxzfgSk56qdD08t5z3 Bxl1ZNRJGGgrjh3y9R17+9qpec+Rku8/UrG1l20AGo9UfFDRTUWeI+zudva3NaQbWJ19 Jlw0n+FtsbEX1ORB0YrgjLEJytRBf8tIJqqmfvwmIpJ3Z30/OnMNHinTj+ykHUKZD2pT cAwCmGUYKaKgX5q8+K1jAexZH483YfF2DjvtBx5QFhjXBWU382gBwZO7wrsKcR1XRRbN spnw== 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 d17-20020a50f691000000b004190767a702si5646374edn.496.2022.03.20.06.48.27; Sun, 20 Mar 2022 06:48:27 -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 E418068B0F6; Sun, 20 Mar 2022 15:48:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C3FC68AC6D for ; Sun, 20 Mar 2022 15:47:56 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nVvuW-0000Ux-0t for ffmpeg-devel@ffmpeg.org; Sun, 20 Mar 2022 14:47:56 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VvtSn3zxHSgGFVvuWnIFQ0; Sun, 20 Mar 2022 14:47:56 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id VvuGnXbpc8eSWVvuHnwTmg; Sun, 20 Mar 2022 14:47:41 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6237308b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=2QT74SdOfomLoF6ZHNAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Mar 2022 14:47:39 +0100 Message-Id: <20220320134739.28728-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320134739.28728-1-michael@niedermayer.cc> References: <20220320134739.28728-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCf7l4R+e1f5UyMa/O6HCGFKSLlSSkRecuxQO6HkE4GUbW+ZnkixAA5buB2uCJLrXHWH5kFi0J6LPRUXzL0qFiMb/MnTya4WdBwCWGg4N72a1gGqWVa4 h9cC9XOppu85fw8w0mtBsqEnfYoRvBjjieDG44VXRPVpwJoZ8NUhWZWh53YcSRKskcK/tIwHqsyQGw== Subject: [FFmpeg-devel] [PATCH 4/4] avformat/aqtitledec: Skip unrepresentable durations 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: 0utvOyMWKT8Y Fixes: signed integer overflow: -5 - 9223372036854775807 cannot be represented in type 'long' Fixes: 45665/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-475618463934054 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aqtitledec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/aqtitledec.c b/libavformat/aqtitledec.c index a37c9bbeaf..6c14b23862 100644 --- a/libavformat/aqtitledec.c +++ b/libavformat/aqtitledec.c @@ -74,7 +74,8 @@ static int aqt_read_header(AVFormatContext *s) new_event = 1; pos = avio_tell(s->pb); if (sub) { - sub->duration = frame - sub->pts; + if (frame >= sub->pts && (uint64_t)frame - sub->pts < INT64_MAX) + sub->duration = frame - sub->pts; sub = NULL; } } else if (*line) {