From patchwork Mon Apr 19 18:23:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp756511iob; Mon, 19 Apr 2021 11:24:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyW8FjHuF2Sjkpg53g1NzKEV5ygqWPXqgOriv6Wmtj7LXqcgpS3i+w3deIJnqj2IqNsDT8 X-Received: by 2002:a05:6402:31b3:: with SMTP id dj19mr10089577edb.180.1618856698802; Mon, 19 Apr 2021 11:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618856698; cv=none; d=google.com; s=arc-20160816; b=bQcErZz5CvzFv71DELqgqPDmnYOE1nbhjZrdak3HIWTizzc9ShbX0YQMA+pt709YPd EGrycHwTwODeFrT7yIEKoa/HcOoRaYeU7cXDKYJJ0ko5CNcLiB4VgU8Z4rG04g5o+0hB uPo6cv0N0Z9B6TqsnKYmyqTqvvW5DxgkPC9VDFQWBlMToIzv6AxcKDoVs3F5KEZJo2NT fCp5UHejMxvcXgbE+o+Sb4tu8eYcVfM5aHkqT3goYwl9lzbm0kFvhhZNg1+M4yOH0JbX nECUdRdBaPGyREKMh7tJ0dbOuuEXqQxmNT9YArfuv1FO0o8bO3xeL2bwoSSGhhrmt7FM ibvw== 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=V8b3V4PMYWHhr0R+xCu2Oq/tvoetHE7XgaF/CGTLTe8=; b=trtpAp+Nu4fbgPgryWmFMRF09NKe98frVX9vdqsD5rS9XVM2R7P//Phj7TkOHaqeLk e4U0yC1SNehISLHkI08pkUs8dR6YKOWPaG/8QpPnrXPtTy0U9ewNPLdkKTq9ETvCEQa8 Ss34lcEKBr3SncP7dPggwRjnOzPUxfTu42+86onoMQzgUc2dj3VA8mVDt/9E3Za0VxgB FjBCHpjcHEFnpO2FCWQoW4vTGVML/3Vm3NowoRJyMH5Y50ZZSxQMXDoajg5ilRwIf7El TF2Dep/O7+U/XAwHVMTL1Ivj4a+M90S0S703DP6hVkBcW+/7YFNuhZZsSwWP6uflO709 CnqQ== 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 f2si9787045edl.536.2021.04.19.11.24.58; Mon, 19 Apr 2021 11:24:58 -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 E57DA68980B; Mon, 19 Apr 2021 21:24:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70F0D680136 for ; Mon, 19 Apr 2021 21:24:47 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lYYZj-005krj-0B for ffmpeg-devel@ffmpeg.org; Mon, 19 Apr 2021 20:24:47 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id YYYllPi9bljeHYYYlltlkF; Mon, 19 Apr 2021 20:23:47 +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=qX5wZS9MHFB6eZLz2DQA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 19 Apr 2021 20:23:39 +0200 Message-Id: <20210419182346.4445-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210419182346.4445-1-michael@niedermayer.cc> References: <20210419182346.4445-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJf15UiK6xucjFd+7mDVRDV/cFObiI4Sa14ui4UM7wvBOj05EH1fIWgqwmhok0Tn8Fib33KZeKYTL2CsdWUgap24BmuzQiJiuf2QEPwDXPmUuzFIEi+z 8EmQXnAIOMnryv+oG9Tth12HNABpi9fdF8w0uPMDcxR+nIDXJBB7ynIe Subject: [FFmpeg-devel] [PATCH 2/9] avformat/mov: Limit nb_chapter_tracks to input size 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: pvEu9QIlggD4 Fixes: Timeout (15k loop iterations instead of 400m) Fixes: 31368/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6601583174483968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9ca1ac89a8..add1e94641 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4687,6 +4687,8 @@ static int mov_read_chap(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < num && !pb->eof_reached; i++) c->chapter_tracks[i] = avio_rb32(pb); + c->nb_chapter_tracks = i; + return 0; }