From patchwork Thu Sep 21 18:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp310518pzf; Thu, 21 Sep 2023 11:10:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmRNMeUzQOK3gDIXLbPvYVr/PcN/v/E3RCrcK0ZK1qZcA+QgB9521jKijD4Qe1NtTSXJ6P X-Received: by 2002:a17:906:cc5c:b0:9aa:138d:9f4e with SMTP id mm28-20020a170906cc5c00b009aa138d9f4emr5464010ejb.56.1695319813823; Thu, 21 Sep 2023 11:10:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695319813; cv=none; d=google.com; s=arc-20160816; b=kRXc91u99tDqNm0CxxrfqbwJAYmgS6oTtLdNOC3kUtt98IuPpKfPeodIW7qhB2QOtk pvNW7NgF7lB45AxfTw5Sy143OCvtpF67hLiOdGY+rkACho1vHHY8oppEj+VE693NMxXD Egv2VrTcmqniWIuLOdnXZe2a1/C8ob5R1NWPI3yq/swFQgs3+8zadRHejm9zNk9r/whT qjWeR7v096mKVAxV5W+EmJa+kkf15xHvkpOZXLIC6Tp75zYjT5buSBO+S5/7FQPpKTRS fnb+tnfSgK7G6YHZCFo1elos3edMtoOY11T9JQ6EwI86+Vr6mewbTcC6BJb1o+EMrG53 0gVA== 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=E2/lyW/z+0wR0pjP0Hl/ZxPV0KA2KVelE3OpJlC/e4o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=vfnkGd0Pvy+gxnE/lGvBWEmBj0f89ankTymRHpUulUcYPwLJnYw5pRp+pfEnkajBDF OoRpj2GlHORgrsqj9yeljeEB6KqjWvHjD1SWSp+00GnPDTzkJdvem7PePRvrLRcYYSBC Nvl5M/ra0ioY0fnPX+5orA+Hqf/ZW1FyRhtRScb3y8XzrHN6LcE0MqJxDU3wGJYXhp+N CBRPsl0Cpk5o87PAxGyt3EqA+EbKQX2ABKhc7e+MsThlQOYJoXmOGdP4kBjvPkT08tVT douJYADVe4P3fNpJqJG5xdihAOxQf947sPrU41PTGvW2xw8rURsYTSD2w0rZ0Vfw/0mR 3hUw== 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 f17-20020a170906561100b009ad84cca656si1848431ejq.735.2023.09.21.11.10.13; Thu, 21 Sep 2023 11:10:13 -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 6ED3768C961; Thu, 21 Sep 2023 21:09:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF0C468C93D for ; Thu, 21 Sep 2023 21:09:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5F4AA40007 for ; Thu, 21 Sep 2023 18:09:18 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 21 Sep 2023 20:09:12 +0200 Message-Id: <20230921180912.10733-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230921180912.10733-1-michael@niedermayer.cc> References: <20230921180912.10733-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/6] avformat/mov: Check avif_info 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: tIyZC6/42iqm Fixes: leak Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6674082962997248 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, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 93c1f9e929a..52939a373ec 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7767,7 +7767,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - if (c->fc->nb_streams) { + if (c->fc->nb_streams || c->avif_info) { av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n"); return 0; }