From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5CAAA4997A for ; Sun, 23 Jun 2024 23:01:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 66EAC68D5D2; Mon, 24 Jun 2024 02:01:46 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9798268CF50 for ; Mon, 24 Jun 2024 02:01:39 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C2D50C0002 for ; Sun, 23 Jun 2024 23:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183698; 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=jAtDwzaJB5ndsVYwU7Z9kuM29qHjNQDhYhzOTlTBMJw=; b=CcqAO39J/aZ4lLTvVcTkVLj4AWraxrl6NereZGA6Y6oVbP9mlPn4Ro7yoVsb4EK7tVw9CZ dNDTa1R+MTHP/STJzyJhqjac34HRfQYG+ybkVQIWiOpLSw8IcOpz47xbhQ1fO2rlRUSx5b RMbgAjt+VvWx+7s5jB182l+QUy4MoARNKZ2KqtPdXf00YptPdXBu0Eop0COTuhZkPEeyPI 4U01LUcoO1uoxHPiuKbclHHqhC7B60A7Z4vIr06hyQtaE5WJPTJihwgqo+5ig5rkSLIoB9 IwNsoyA1UcHZBCUuKG+RShkBdyVsZmb7MVP5X0sZY8Ao6Rpm8gkSklg4Ri/a9g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:33 +0200 Message-ID: <20240623230137.1749178-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/aac/aacdec_usac: Test ac in usac 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: ff_aac_usac_config_decode() needs AACDecContext to be set but some callers pass NULL. I have no real testcase to implement/test this, so failing in this case seems safest. Fixes: member access within null pointer of type 'AACDecContext' (aka 'struct AACDecContext') Fixes: 69435/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5733527483121664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_usac.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 132ffee9c20..4856c1786b7 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -348,6 +348,9 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, int map_pos_set = 0; uint8_t layout_map[MAX_ELEM_ID*4][3] = { 0 }; + if (!ac) + return AVERROR_PATCHWELCOME; + memset(usac, 0, sizeof(*usac)); freq_idx = get_bits(gb, 5); /* usacSamplingFrequencyIndex */ -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".