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 E226E4980D for ; Thu, 21 Mar 2024 01:16:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB4A568D509; Thu, 21 Mar 2024 03:15:30 +0200 (EET) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E622868D4E4 for ; Thu, 21 Mar 2024 03:15:22 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 42E53240004 for ; Thu, 21 Mar 2024 01:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710983722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=MgQkRK/RDvc7ae8CpMY/cQac16SCt7pUXBatKCZDga0=; b=WdS9U9bb1Ya20r8+9H3UK26wr9lXvp1vdJ+nwfg74MvELzvWG/5xxSs3oynuxSHrEhX36n cB4QtG8LaXhw5S1RXiZR5pw5mG85Uy0oNtTcC8SntYE6XHu3SF2s2E7p3eL78ib3NvBXyx +X5blAwis0EXePVV2E/k+2eI6ISEv1uEsWXVh1jsSbHxfQQ8t7iTGJ1gvkfCYmipCXYVQR y7kLqG6Kzp3HcMDJr6E8JAIVtVVvEaHTYeJ3Zf4uH0S4wCK/gvn466IJMKP2hlzTJzarpa i9aqfeQ9uGamh/8VHOM7D78ZGKev/Kv0/BGUY5or3N1bcrxSn1tSxpC3VWSapQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 21 Mar 2024 02:15:17 +0100 Message-Id: <20240321011517.10363-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240321011517.10363-1-michael@niedermayer.cc> References: <20240321011517.10363-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avformat/iamf: Check language_label 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 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: Fixes: null pointer dereference Fixes: 67023/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-6011025237278720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iamf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/iamf.c b/libavformat/iamf.c index 5de70dc082..f2c22ce3aa 100644 --- a/libavformat/iamf.c +++ b/libavformat/iamf.c @@ -89,9 +89,10 @@ void ff_iamf_free_mix_presentation(IAMFMixPresentation **pmix_presentation) if (!mix_presentation) return; - for (int i = 0; i < mix_presentation->count_label; i++) - av_free(mix_presentation->language_label[i]); - av_free(mix_presentation->language_label); + if (mix_presentation->language_label) + for (int i = 0; i < mix_presentation->count_label; i++) + av_free(mix_presentation->language_label[i]); + av_freep(&mix_presentation->language_label); av_iamf_mix_presentation_free(&mix_presentation->mix); av_freep(pmix_presentation); } -- 2.17.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".