From patchwork Mon Apr 19 18:23:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp760845iob; Mon, 19 Apr 2021 11:30:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZobBPuvCDXGOJeIV3Z6oz/JH90dCmtlsCLpYTtnXsgbuWWYlVOXZg+zbKVxRp5RCQQmfH X-Received: by 2002:aa7:c4c1:: with SMTP id p1mr8946735edr.133.1618857054060; Mon, 19 Apr 2021 11:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618857054; cv=none; d=google.com; s=arc-20160816; b=MXSRlANU65Yi4Wzi6hliLbz3nBil/7ryWYuUI1ExpcWLIHz7RBkEVO+14l3z6r1rNx QoM9fJBTY4GWDN5uDEMygNGxG0qGAzHKjFX111qbWg+46wmEac7FwNU7kENRfHUg+MOZ 9hyHy7HSYtD5Rvp6ziEUmO4tKNJzh0d8PQDm7l/MW8XieWZAbNpxczVDDY8RYwjDYMiZ UaE3gRnRMUlldEoSdgOu9i46HUb1mSmM59IxGrliRwsmNPdMvbqNIEA1a4ftdTdOjvuA nCRh263XCGxGzYeRy07ml81Au9iPDD7E5NWLVnt2NmY1rRClBKTE/IDJ99gGf4/L1FJi NetQ== 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=ndSNKbUcC7wtQhuNdVi0g8RvcnOo0vJaML4VqPpG6S0=; b=ivE+9xPYTWWiEMXRxnlbPr1zdzkTv9pc+FWwmkZ0qXflMaWSgLzPdeM7eGu2MFAfsF s6Zr0xzJu9U50u/G9w1SbDuPMFSRPlxz41zaadTHUkzWUVmGsHm0WmQvVcMa8SWI15WV RhM5zdlDblEUFXwcF3hLtpUrha6S0KkP3zuawHxI65OW91h4sPNPnWXKPzz5vnlstjqM hzAdIW5gs8VGi9pw1OZlNQhy7sP/7Xo/WCVvrKsiOnRJO0ER4QRz880w9Acz8QlOy+SO 95kiF4x+7PfWq3MJf+ZWuRimIEPh1OvXS4BeoQU8ZAIcvq+rR9OFyhxtICGVNFyIFzyL 9dDw== 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 g3si12998014edu.276.2021.04.19.11.30.53; Mon, 19 Apr 2021 11:30:54 -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 2221868811D; Mon, 19 Apr 2021 21:30:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CC9568993C for ; Mon, 19 Apr 2021 21:30:35 +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 1lYYZj-008XHR-08 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 YYYllPi9qljeHYYYlltlkI; 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=5VDQGX7n4znJNIm0dj8A: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:40 +0200 Message-Id: <20210419182346.4445-3-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 3/9] avformat/mov: Ignore duplicate CoLL 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: Ta29bSw+ZqqZ Fixes: memleak Fixes: 32146/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5377612845285376 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index add1e94641..3436fb6b73 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5501,6 +5501,11 @@ static int mov_read_coll(MOVContext *c, AVIOContext *pb, MOVAtom atom) } avio_skip(pb, 3); /* flags */ + if (sc->coll){ + av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate COLL\n"); + return 0; + } + sc->coll = av_content_light_metadata_alloc(&sc->coll_size); if (!sc->coll) return AVERROR(ENOMEM);