From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B614344AF3 for ; Wed, 13 Aug 2025 11:20:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 37F7268CCF4; Wed, 13 Aug 2025 14:20:49 +0300 (EEST) Received: from 2daa80421c55 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id ECD2968C4C1 for ; Wed, 13 Aug 2025 14:20:47 +0300 (EEST) MIME-Version: 1.0 From: michaelni To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] =?utf-8?q?=5BPATCH=5D_avcodec/aac/aacdec=3A_dont_?= =?utf-8?q?allow_ff=5Faac=5Foutput=5Fconfigure=28=29_allocating_a_new_fram?= =?utf-8?q?e_if_it_has_no_frame_=28PR_=2320234=29?= 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" Message-Id: <20250813112049.37F7268CCF4@ffbox0-bg.ffmpeg.org> Date: Wed, 13 Aug 2025 14:20:49 +0300 (EEST) Archived-At: List-Archive: List-Post: PR #20234 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20234 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20234.patch Fixes: null pointer dereference Fixes: crash_test.mp4 Found-by: Intel PSIRT Signed-off-by: Michael Niedermayer >From 259e739c8eb562738bb41938f23391a4b3953789 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 13 Aug 2025 13:11:23 +0200 Subject: [PATCH] avcodec/aac/aacdec: dont allow ff_aac_output_configure() allocating a new frame if it has no frame Fixes: null pointer dereference Fixes: crash_test.mp4 Found-by: Intel PSIRT 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 6a2aa9dc8e..947079bc3d 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -466,6 +466,9 @@ int ff_aac_output_configure(AACDecContext *ac, uint8_t id_map[TYPE_END][MAX_ELEM_ID] = {{ 0 }}; uint8_t type_counts[TYPE_END] = { 0 }; + if (get_new_frame && !ac->frame) + return AVERROR_INVALIDDATA; + if (ac->oc[1].layout_map != layout_map) { memcpy(ac->oc[1].layout_map, layout_map, tags * sizeof(layout_map[0])); ac->oc[1].layout_map_tags = tags; -- 2.49.1 _______________________________________________ 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".