From patchwork Wed Nov 8 02:12:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44571 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f392:b0:181:818d:5e7f with SMTP id qr18csp93464pzb; Tue, 7 Nov 2023 18:12:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/BAbNUMHPyE6g4h6JCWWhCFvylQjX5NK2+FhacENKRGxVEuq7rB6psrR1ofAEFD02ZRwF X-Received: by 2002:a17:907:1b1e:b0:9de:2b93:cab9 with SMTP id mp30-20020a1709071b1e00b009de2b93cab9mr261014ejc.8.1699409576540; Tue, 07 Nov 2023 18:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699409576; cv=none; d=google.com; s=arc-20160816; b=ThGydL1YsZIHY3wy4Vjx7NuVNJhcCak3I7IwR42IkqKYvdx5R7lzgLTc8jgFgKs4sb 4fWy8R57hRpn08qJAFklQXj18q835ZfZm4tBWb4DhxpQ10MTcTQvBoKCPf73I+akgglB zbiA2s3DoAd5kkU93qLzd3kudt8jDHSqhJaCJR0B6Py8khoSc08HVCAi7z/8p+wgGApS dmM1XfVX6qELO9MqZWGHzwhk+yME/mUN46YfgveksE8z9vfQ6xwcSfFdBxNT+wnJLe7A Qifju5BP2gBjT2ghafBs8e/YhTfXqN/KOsnfGVTWBxRvbPQuaGiUwh/5s2ggUl991E/P aBMA== 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=1MdvQ7iKH78Bht4cpxVlbjQTu/h3omotaiT3IuMc9Qs=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=dhNWPl0AW+hdOgtSeOaoas3YQus5EGhguW1bEKx1w0V3GR4iQAwuDJ5hDls6KGRd2G 1/TJsy1HwS70gUfXZwTUSFEIlq3wUdpvHAaXgxZxW1yCqmtseYYw/oUq9jf0gO3ATcAB xB8iBvpve3CCvvsYprtzdfgbTBir4IhrnzouVPvGih+VQa7zNrkO+ImK67aunZHR6L7j ZNy142ED4P0b1H3aCxU8zFt/Mf49qUI7TFIIAHuWRhpFKXII17PqNvSx3JQoX14mXqAK A0qQW9bV158mxi1BCAFgiiy2kqs1FoVJFRGsaYwq3XrvClcgeVTodBKB5TC9AG1iBvVE +hLQ== 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 du9-20020a17090772c900b009de293f39edsi1666888ejc.119.2023.11.07.18.12.56; Tue, 07 Nov 2023 18:12:56 -0800 (PST) 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 D907D68CAE4; Wed, 8 Nov 2023 04:12:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9055D68C82F for ; Wed, 8 Nov 2023 04:12:46 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id BB4D660002 for ; Wed, 8 Nov 2023 02:12:45 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 Nov 2023 03:12:42 +0100 Message-Id: <20231108021244.8669-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Disallow FTYP after streams 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: IpxL8b7nTJ+y Fixes: Assertion !c->fc->nb_streams failed at libavformat/mov.c:7799 Fixes: 63875/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5479178702815232 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 e8efccf6ebf..34ca8095c22 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1222,6 +1222,8 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb, MOVAtom atom) int ret = ffio_read_size(pb, type, 4); if (ret < 0) return ret; + if (c->fc->nb_streams) + return AVERROR_INVALIDDATA; if (strcmp(type, "qt ")) c->isom = 1;