From patchwork Sun Jun 30 23:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1459990vqv; Sun, 30 Jun 2024 16:13:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyYHrC4geXNVfUtF/JpjJP58qbT/FHssshO2YEbfHWDb77zBTOCZ6tuwvBrO6JMMoypt/EPT+4BK39p0x8/m8/aJCVUuJvg63vVw== X-Google-Smtp-Source: AGHT+IFwvyEsCXNTP0YiJnffcTd5C0biMv93TEDOn8er+v8Ue+xZRQ880cIzJxYb6olGB6RE7rop X-Received: by 2002:a17:907:86a4:b0:a6f:1872:4e1f with SMTP id a640c23a62f3a-a75144bae25mr243721266b.77.1719789220560; Sun, 30 Jun 2024 16:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789220; cv=none; d=google.com; s=arc-20160816; b=SQiDoSvwa0NAQVWOGCwKPCLkWESAb7+vvMRWoG0+3zJckIcOm8vXa0utoy4L0TujdR BfC798XZn+X2p9/Im7U1FN5HaTQeaCHVa42/vHzcFlgFOcFVipTVjTVW6Q5HGbW0Y5dg +2tnB+kGKLKKIQYvRJ6y0q82E7kvKpsjlAkjBIIaY58QtsVgXqyhVbf4Oi3j6qnhv6ff 8CwKGnLoISs1U6Fdq7Q4Sv9uAFfuPzckG8BEScLuegIiJSk6Ax5DmEodJdP31esBuh+q 5eYoI5vvesIxr4B7+Yrr8PXVUWa5LWwabSzGRlgfN5GxxFvOmHoC4n5ZpgcMQ0f9dU0g o0ag== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=YBFrAXQsiuPtVpHKM4FAe+2a0dWo1I0voDcRU2lnqg0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=1Jd5Cgj1PVTsO+Is36T/zVluPuU/QxsmOMr+MyNnnr6x2iWVKbASnfTswdBAKQm/qr lv6GvsUxrdCquTRaxnyS78GOwFJB2y/HTNDUgIlM/XROReViGAqAV94PyHwaI36lcsAe J8i4S8oathcEmCb2JugGLz+OXdlb62yZ8rU8kcfJyb0rXr71SJI9nQijT1EaT/dxNvrd mlFl8xZCknjpnZJ3AvgmMZg4hsXl7esteY7Hs9XiDHoUJvHH307KtR2p5fAULaI9aSZr MXvd2CVKdqWHDx55Yo7V4pVxUzi33Oie1SdIQK7D6eM+80kWTopS3nmLZznLTlmBzngb agsg==; 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=cEKYR6tp; 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 a640c23a62f3a-a72aaef63e1si305963366b.71.2024.06.30.16.13.40; Sun, 30 Jun 2024 16:13:40 -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=cEKYR6tp; 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 259D968D6C0; Mon, 1 Jul 2024 02:13:21 +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 A1F9768D653 for ; Mon, 1 Jul 2024 02:13:10 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 02254FF802 for ; Sun, 30 Jun 2024 23:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789190; 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: in-reply-to:in-reply-to:references:references; bh=QhOQaOZ9Qcz22nnvJDfDhArxUNO+9U9egyo6HeeVDEQ=; b=cEKYR6tpUVycK6UUskPp1DGtHhKaRJ0aID77ifRIAGc/UmAfrRBn0+JQVATwXqOREfwOrI tRDB9bIPNnh97VthZ2Cw/jktinzHel6ykApaAxBaex4xHUojSnuXtSNVP/FYp3Oj2h18VL viynQOOaf8NSxwc/1LnMyG/1bAx5sYG0cUlbIVGF9zj6yJizv+3smLvUY/Xx7OcyiocjX1 L729KesVtAVAqqy9GKQ5edNkM2HmgWGDDGO4MqdJOnXV0/2/HD665kBMe6cs/BhV5mYLuG CuXsS+GlGhtCxEkYhvO0FFL4MoI3X58mOZc+aZKXBceg/rrnc7HG9KPVj55yWg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:42 +0200 Message-ID: <20240630231306.3779027-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/aac/aacdec: Check if frame is allocated in frame_configure_elements() 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: 51w8SN4rUNy/ I did not investigate exactly why frame is NULL, happy to provide the sample if someone wants to investigate further Fixes: NULL pointer dereference Fixes: 69893/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-4965255361396736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index ea2ba84a80c..6a70c69034c 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -186,6 +186,9 @@ static int frame_configure_elements(AVCodecContext *avctx) } } + if (!ac->frame) + return AVERROR_INVALIDDATA; + /* get output buffer */ av_frame_unref(ac->frame); if (!avctx->ch_layout.nb_channels)