virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avformat/aiffdec: Check for previously set channels

Browse Source 
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@niedermayer.cc>
(cherry picked from commit 23b29f72ee)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2024-03-22 23:07:01 +01:00
parent f5f350919e
commit 2c06fbfd0d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/aiffdec.c
View File

@ -106,6 +106,8 @@ static int get_aiff_header(AVFormatContext *s, int64_t size,
size++; size++;
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
channels = avio_rb16(pb); 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; par->ch_layout.nb_channels = channels;
num_frames = avio_rb32(pb); num_frames = avio_rb32(pb);
par->bits_per_coded_sample = avio_rb16(pb); par->bits_per_coded_sample = avio_rb16(pb);