From patchwork Sun Oct 22 00:35:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp662634pzb; Sat, 21 Oct 2023 17:35:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERTFZC48GeI44ZtHIXHpkjZHXfsZICBetD8kiEE2I8tNbRP8mOviYw51v3qUYTA7BZm0qu X-Received: by 2002:a17:907:728b:b0:9be:481c:60bf with SMTP id dt11-20020a170907728b00b009be481c60bfmr4346369ejc.55.1697934934364; Sat, 21 Oct 2023 17:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697934934; cv=none; d=google.com; s=arc-20160816; b=PHWpbtG80C0DoBZVzEPKH01ec9LZu2/Y50dOLCbuIAYdN5lQxXtKbjm4jaZ/fKC7ya 4tnJQUKbUAJJbq+oSNg6aFCaAxddD6VEdagk+Vsqcy8ELIqi9k0GzKDIVU4Zs4u+I2Q+ VUaa9WoDr+onNiADfP/NQH2Pxhen+QZU7os21qpd+VaIEJylSWJhjqEEHgFYQ0N2JNii DLeEV1/wWB9/34AqK3eSwKeOCvv30+I3m+IlP8OegaQAjKQXq0Nh0mVztlT2yzkMwOTK 2b7/DzZ32GgChMAotfdAoMa8dlZf5GMDs5dNwwUp7/7KETC/X8A27mBdREWgHv45my3K bFLg== 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=/nd0+Oz1Or05dKh8yweWUiJJl1chO0Hm1uoSYgcbGOU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=V5eQsMdqmjWryNZ+X1C/gUPPkOllKzKnMQCAv2af17Rj1sk+zKjpU4l6/9EnSfBBvC +k+9JDCP92FTekcmC+ALL/hUxMbMa+S6fkDEBZXOhIBGpLt57Ps+M/Am9SI3TZtegelr tcG3eSHZDAB41TMRm6j4uawXMZSGM00cFFpTqBB9trphk8n7NUPyQ65hTNh5FBwUCl06 oEDKDDpwMbZD4S4dSEN0+qeInH1CjER+N8+PWunqDZLlFuqNhx44aZXEZOSyI9EBQCjI DwVqfjZrwmxohNC5Md8rktMQBiJH1x9iZ6AxSQ2BN5jQ0j5zVOYczZiIj9c6pxqFPvj4 X19w== 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 du8-20020a17090772c800b009c7558b2a52si1935056ejc.493.2023.10.21.17.35.32; Sat, 21 Oct 2023 17:35:34 -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 5BE5C68CA3C; Sun, 22 Oct 2023 03:35:28 +0300 (EEST) 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 A4EA668C78E for ; Sun, 22 Oct 2023 03:35:21 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0374560002 for ; Sun, 22 Oct 2023 00:35:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Oct 2023 02:35:15 +0200 Message-Id: <20231022003520.17154-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/6] avformat/mov: Check that is_still_picture_avif has no trak based 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: Z1fIALLN9T6y Fixes: Assertion failure in mov_read_iloc( in mov_read_iloc()) Fixes: 62866/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5282997370486784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2f29487beb8..e8efccf6ebf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4628,6 +4628,10 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVStreamContext *sc; int ret; + if (c->is_still_picture_avif) { + return AVERROR_INVALIDDATA; + } + st = avformat_new_stream(c->fc, NULL); if (!st) return AVERROR(ENOMEM); st->id = -1;