From patchwork Mon Sep 13 21:04:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30219 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4378118iov; Mon, 13 Sep 2021 14:05:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2DVTZ1zRUvlx8XhijQzDOqSop9VWvuVZXB38zs6xLK+eVgeiCb2ithRmKgMkbpAkkzKaV X-Received: by 2002:a17:906:e82:: with SMTP id p2mr14620214ejf.50.1631567123946; Mon, 13 Sep 2021 14:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631567123; cv=none; d=google.com; s=arc-20160816; b=lTycfF9zRPuMTBijMYjFNe0NhoLE7aRrDHz0GhPPTRzxmla1uBarRiIIxJECvs1v6F h73YQj/8HoWbsoXR4sOXybfeCXx+/pbpTQ9nTlcf9NtGbD8T/qPRS4r+iiJ28JPG/k2o QlMJy+zzcEeVE73+f80IH1ponNE/qpG137U9qJO6XmDQ+ebPnilp3atNpgazTNt081vo KZ3FIezSN+JQAMcyJKPTePSx8nj+MiDPGAf33RdMd53ZxopWNfYEDpi6u9byAtuvFUP/ bv1xoNQ/lAr9V5djHDrfH20lidnyC/MsLdHHEv0IpngJzBrdbKwicaoB1cckSrHicG9k 2qQw== 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=wJCGoItQqLtkIngbE+8bGteIqpIebts6/ThE/EIHKEo=; b=Mn/VhlGG6nC9d2eVc8L/PUo6HafVaM5zVklfjx8stC0GgbVdLaEl2pSW9aqP6lK6K6 jWSG31pwCgKI+dDUo93rQBGzm+JI4h2Ls6zMirZRPRIC6hk7qtn0lKjyLak5yY8TnOx5 jRv39XnnkHgCNEUEsqjWoO2ns3MCVcpmuRoDpC5aPoDzXt/XpFS22uGrXdXSmeginSUk tkV9KNgBb0iZoZ1+H29gfSc0ZE/vG+0zchKNxisCRZdL1CERet8k5sXjarh7EpwxfiPo 5GWY0w2o4S0cEdpLLhaTdBesPgAle+YiCXUfCnafCGxKi12fYZ5HDFOiVdpg4k88kGCA gfhA== 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 j30si9240374ejo.776.2021.09.13.14.05.23; Mon, 13 Sep 2021 14:05:23 -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 82FF768AE31; Tue, 14 Sep 2021 00:05:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 808E268ADC0 for ; Tue, 14 Sep 2021 00:05:13 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mPt8b-00DXvF-0A for ffmpeg-devel@ffmpeg.org; Mon, 13 Sep 2021 23:05:13 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Pt7dmKVs8ljeHPt7dmFjbZ; Mon, 13 Sep 2021 23:04:13 +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=NNW6DLzovRxJgBtaslQA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 Sep 2021 23:04:13 +0200 Message-Id: <20210913210413.8429-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfEWoSA3N4Q2Aa4LqxOWb55e8GaVA4UTvZVc6qLF/74P9mXIdJE8az8TfjU1JEc+kxX7n0KT9fiCB6FS0RVEtwsqRfGhouCN0bE431+tbBTWGnbDPT713 iCyva+kt7OW0jqUASVvFhKsfobpLbqLdCoZgU6M6DldusbWGNN0QVkOI Subject: [FFmpeg-devel] [PATCH] avformat/mov: Check for duplicate clli 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: 2k7vEMuJSCtA Fixes: memleak Fixes: 35261/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4869656287510528 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index c5583e07c79..343c0c0ee35 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5485,6 +5485,9 @@ static int mov_read_clli(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_INVALIDDATA; } + if (sc->coll) + return AVERROR_INVALIDDATA; + sc->coll = av_content_light_metadata_alloc(&sc->coll_size); if (!sc->coll) return AVERROR(ENOMEM);