[FFmpeg-devel] [PATCH 3/3] avformat/aiffdec: Check for previously set channels
Michael Niedermayer
michael at niedermayer.cc
Sat Mar 23 01:08:18 EET 2024
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 <michael at niedermayer.cc>
---
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
More information about the ffmpeg-devel
mailing list