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 2D3044A16D for ; Fri, 22 Mar 2024 23:08:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 836D968D53A; Sat, 23 Mar 2024 01:08:29 +0200 (EET) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C776668CF89 for ; Sat, 23 Mar 2024 01:08:21 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3B5A7E0005 for ; Fri, 22 Mar 2024 23:08:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711148901; 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=+l6P8qJK9N2Bpb58BsZ41TVh0kvhBB6dOaHoRPkKg+g=; b=MeDEp/NufVYcccbumtVRPJ7oLXC1oWWnpgSGmZHGqZWWVYbipW0a+1aQiMxsymMfdQH7dC mbrPA90TZsToFJYYrC67q7+UL7EHAF0d7JjOmIutTi6Vbi8zJBqpXVTGnaq4OtA9BeybO6 WXj2Th9bqSXiKwGZJcsnYqPsJ2GwpMCvHSjqZlqDzndAtvV51utv7fKsqJW0tLtLtBJyyK j62Msl/KjS18IDnluW1O948GLO0dH8AmYWfdcVN47/OD9AYi2NDDpLcQh5U8sTW20+XJgk uEVK1O/72Zb7Z0nPPn922x7CKmZMNxjSHmN91zot6f5b0Ql2Z7nXNUZhMdOkEQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 23 Mar 2024 00:08:18 +0100 Message-Id: <20240322230818.18997-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240322230818.18997-1-michael@niedermayer.cc> References: <20240322230818.18997-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avformat/aiffdec: Check for previously set channels 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: out of array access (av_channel_layout_copy()) Fixes: 67087/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-4920720268263424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 9318943f96..fc01ffcbf1 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -106,6 +106,8 @@ static int get_aiff_header(AVFormatContext *s, int64_t size, size++; par->codec_type = AVMEDIA_TYPE_AUDIO; channels = avio_rb16(pb); + if (par->ch_layout.nb_channels && par->ch_layout.nb_channels != channels) + return AVERROR_INVALIDDATA; par->ch_layout.nb_channels = channels; num_frames = avio_rb32(pb); par->bits_per_coded_sample = avio_rb16(pb); -- 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".