From patchwork Sun Apr 16 22:25:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963444pzb; Sun, 16 Apr 2023 15:25:47 -0700 (PDT) X-Google-Smtp-Source: AKy350ZwxDwTkHBXTHeooGbM1FH08HnCSQGrJ4Tbm4OK21zvRqfVZu7Q8ZmdeCU1OsQ3l+JPvu64 X-Received: by 2002:a17:906:6091:b0:94c:93e4:b0c with SMTP id t17-20020a170906609100b0094c93e40b0cmr5902570ejj.76.1681683946946; Sun, 16 Apr 2023 15:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683946; cv=none; d=google.com; s=arc-20160816; b=cUsl9CGgLi4D/ALWW6tyjaQ2hDBRN2LXeqjsz2N5YGPANU59PB2CesaKXege42KLSV E1k5ritXgzV47vtJEw8YWpACyDEF5i/uL6Hx+0oMONQO0aPvTAdyP2c138K9cmM7JKh+ EQua0GXW/A7cev+TnKvYhNKxVv6Oi6PZyl9c2LnCTDYqHYNVzg7Pe80nVq0fUmjX+mF3 OAzn7bAqLUfgnFuYx7uFmBXIzY9aAieTdthNABvIZrtNEECkyoIYkx+pdfeB9KJdOyWW akpGswToXJHAZOAaTOhTvo4NaQjI+WpC1/wS2yIv7v8FTWBwjqFxQsnCMJ3JxPUyMy49 V6cw== 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=nsAOGf3k96OU2TPWwOLQDnuXyZ1p/rMjNGru8qlb4JM=; b=XhQ6DVGPk7NWs474faaVdxOC9r4jNiutgi6mBIICIfkM0jitFsDznv9xoI48ty4qwK HFiLupNvjwCx0wBaUNOlUbLvnWqHefm4GYf3FEc/GKjxL6zyjN6zaGNXcminRlyOzQvn c/avjcRopdt2kgfpWrQcmsjUkVyVPM2MG0CXHzq02bexumjWmR/Yyr/onYUsxyrZpdbx t7fwTqXhdzF2GWISUVYg+HtFESOjP1At0DmVn4j/NTrSYG7qZB6qsIygIZXZBG/i6Y1e Mc4bHhLludbUjjfJemgnltYlpEaWl0gJNkV7zdnaD2MKWt5JmHI4f/ibkuRcVYDHB7Jm 2wew== 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 ep13-20020a1709069b4d00b0094f5befc4b2si1768201ejc.321.2023.04.16.15.25.46; Sun, 16 Apr 2023 15:25:46 -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 0178168BE2E; Mon, 17 Apr 2023 01:25:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE1C468BDFF for ; Mon, 17 Apr 2023 01:25:21 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 37274FF809 for ; Sun, 16 Apr 2023 22:25:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:16 +0200 Message-Id: <20230416222518.21308-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mov: Better check for duplicate iloc 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: u9GTNBc9FA9i Fixes: memleak Fixes: 45982/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 057fd872b10..6853bb324cf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7777,7 +7777,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; }