From patchwork Sun Jul 11 13:26:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28886 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp2127803ybk; Sun, 11 Jul 2021 06:33:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5vi1KEr1uVu3UvERp+vH2oZ1hOuPDjvZ1nBoPWMxhW2648AOfJKiBtdAxiXjRrk+j7H6X X-Received: by 2002:a05:6402:40c2:: with SMTP id z2mr58457990edb.134.1626010413383; Sun, 11 Jul 2021 06:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626010413; cv=none; d=google.com; s=arc-20160816; b=cokI3P5xvwWZy9IWSgWiqukXhaMyfc8nCAOmWzc5EBVMP9JlVDXa03eEt1Q8b2wwkU 77JWidc+11xT1ggLhupDFkVCw/x9Zn+dUqrMEzuM7TksSIBFuK2eNPKAHNkqM8b2NS/D vxJTodH+C/77TZs/cV0ws7y3PdQMnnNK+KZKzt5bA3vJQH4BMi4WTXEQ7RxouK/Asaym FzyfzxOGWlS5Va1bVwi7OVy5dSZEaZkGWAefcDpXKaSRGyroPoKumV5wzxmg5iW4N5id lKQFwqyP/71hFYnMkyp2NsJO7UIki/qc4omPYyVCHXhOOJbp6v6t28om0pejSlHcuUuQ 9vdA== 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=0t8TEQncvoQ/xlcY62lnuDI1RJV8FsL2e5XeZxIvkX8=; b=lQ2iMekKIblEK5S3LBzMUDY46PR078mUr/PB4l2Ah4TLmftD48RdZYERPFUGsnpSbd 1W8Zl87RCpd+osOu71rOKIQHVkQRvMs61iOxhgDxvTbujy+jFzWZJwtBIGn352K5kP2p IJmpXgwna4RsBPivYWwHV1EU1QDDJwKYgVhdmlL8RvbuzUxsHbWWibRygaPp+Stw1FVx ZS2huVuXVEvPnSu1mJ92mo8TLwQpFVZX6AlubgV0WdMQsvLk26fkOPg5RPa0BEBkUKl6 /29v+vfyDmQKm/ui1NBWUKY97BiARNIuQrEkacToPsJIsnuflNLEAq2J+Km08domT0kC qRhQ== 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 w11si15838388ejc.737.2021.07.11.06.33.33; Sun, 11 Jul 2021 06:33:33 -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 C8EC768A742; Sun, 11 Jul 2021 16:33:30 +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 996E568A094 for ; Sun, 11 Jul 2021 16:33:23 +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 1m2ZUc-00GsAN-0D for ffmpeg-devel@ffmpeg.org; Sun, 11 Jul 2021 15:27:34 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2ZTemD0BsljeH2ZTemFsjL; Sun, 11 Jul 2021 15:26:34 +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 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Jul 2021 15:26:34 +0200 Message-Id: <20210711132634.14829-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210711132634.14829-1-michael@niedermayer.cc> References: <20210711132634.14829-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfF0z9j3CBYele1xBwquDFFx27G4meQL3fTTKSx3ireyAKzBU85iOZRNztA/4tyN3csCBC75EuCRmQ0sf7ZatB9By9siPqnXAm4Js2NGEOXGHlq9pVZit Ch12u8StrrDRGh/7mAzynLb59PpTF6wNZYLWtC9aQ5DRbdP5uaKZAUhI Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: do not ignore errors in mov_metadata_hmmt() 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: idFtZLUyelXl Content-Length: 1040 Fixes: Timeout Fixes: 35637/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6311060272447488 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 2e061a55d1..84a240e2ca 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -286,6 +286,8 @@ static int mov_metadata_hmmt(MOVContext *c, AVIOContext *pb, unsigned len) int moment_time = avio_rb32(pb); avpriv_new_chapter(c->fc, i, av_make_q(1, 1000), moment_time, AV_NOPTS_VALUE, NULL); } + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; return 0; }