From patchwork Fri Apr 26 03:08:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48262 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp112183pzb; Thu, 25 Apr 2024 20:08:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWskNS8GVrng4M92qudmWhhXKiJZRBBQTVRadmQUFDGz5PHxyZL8YZWysiQbXkcTM61uiVu+Oj3aa3BcK7eNj3pYV47jzOQQM1QIA== X-Google-Smtp-Source: AGHT+IGJSwEHmn/Ug0UrgEYa7MjptYETV29EHQ2gPUtk6NTjNqMS2VoSBhZirPoh2cTE1Me6bBuw X-Received: by 2002:a17:906:c14b:b0:a58:c299:34f3 with SMTP id dp11-20020a170906c14b00b00a58c29934f3mr1116697ejc.55.1714100932942; Thu, 25 Apr 2024 20:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714100932; cv=none; d=google.com; s=arc-20160816; b=nzz46PScCZRtTaHM8FZ+mFEDqhok/cgs0TJ9hh0TruqJVLRutXC4ZWRHfAzCL229Hy 5PwEap0vP3iLCWmp4KSH0ov2ctRH9DgIzUBeSg+8OolwlQDEwXIdG+MpWj3IZnub7nRB aA2VJWvDvST7neoMdug0yxa30miW0WuS7UATUV7Zk4X2GahQPYifOySSWheKzhIWRlwC HHy4xBBWcd5hABfvSjMDKaT2xOVEenMNOxznj7i/xlstbO4Ze2xgbbh7hcfZqM0tAoXy JPszPfnzpsMQYYkfBMmeijhZWjSv7eiOBjBL151UuBHV1tkohavZpbPxmpimEfZEX1E5 wR+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=tnC4VJucQFO7H6HAakEnxq37iHybU3WDHA1qNYMU/Yk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ArbhzLgPdY2xrZuFYp9G3q4xivYVr5eqdON9+ngimFDxI6oRs057S/PM62bhn8GI0c Y6Phbbh/J4Gq0tUIjfH8zUH2kKrPJOsUmM+cE6Oh6SUuUG3tDrZIIUG4FFhXjMtq6apd bMul/DgTZ58OB3Tw0MafcCEVNETE8AS8UozuMw5zW81UAFYBydI9QhPxxbhcEh1A27eG v6J7WOxIzMgIU4OXaQQXNWKJsm9R7+ZcHNfImrjMhDIvTaNENyEqsH18BN1fJBlWBFot tFgjBouJyosAIl5njT8+kW/29PU7NfSRAq6LlVd4YnkIKw2wWdxoxiRGGyjExr3NDAvn VU+g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Tfg9NCMq; 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 f21-20020a17090624d500b00a55b0215e7dsi6526306ejb.215.2024.04.25.20.08.52; Thu, 25 Apr 2024 20:08:52 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Tfg9NCMq; 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 B70A468D3B9; Fri, 26 Apr 2024 06:08:47 +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 CEC4568D27C for ; Fri, 26 Apr 2024 06:08:40 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0277340002 for ; Fri, 26 Apr 2024 03:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714100920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0jOVbyuCWD6xhnPe6P796uSXXChwTEG0vSwmrDoD0yQ=; b=Tfg9NCMqWvno1Nl5v6UgL5s7GGIPNbxeGb4/jVGDwOnj1knWmwqOa3Pm5P2B73+fJdSDI1 k6YGmA2guPeZdFEp+7Wj4C5dQwncbJ501HjC+4zW/UjKrB90HqzJq+INXM4rwbVELZ3LjN NykiC6N0kJDN0O2YYF0/Do93fH4P6MQWn1ytz4MS8GSR8hMtLXo02SA6MumoGDVLVe2ZYR 8ie0j1aSaCM1L/htfavFxL/cFsqjQ/hK/EId0/l8q/YiYrziY/fm/2dWiZAdq+JprSpNph nJPV8Pv8V8OXQ6k/FZXzMN/8Uieaia61P6PKYewAl3zr60fYK7SdvtBTXurtYA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 26 Apr 2024 05:08:34 +0200 Message-ID: <20240426030839.3001504-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/6] avformat/mov: Check tile_item_list 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yyJDDQjbjBHy Fixes: Null pointer dereference Fixes: 67861/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5352628142800896 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 ecd29a7d08b..97a24e6737e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9289,6 +9289,9 @@ static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid, if (tile_grid->nb_tiles != size) return AVERROR_INVALIDDATA; + for (int i = 0; i < size; i++) + if (!grid->tile_item_list[i]) + return AVERROR_INVALIDDATA; for (int i = 0; i < tile_cols; i++) tile_grid->coded_width += grid->tile_item_list[i]->width; for (int i = 0; i < size; i += tile_cols)