From ca19dbf33d8f1346588c49d3123ee7ad40649cf0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 17 Jul 2024 00:56:58 +0200 Subject: [PATCH] avformat/iamf_parse: Check for negative sample sizes Fixes: index -2 out of bounds for type 'const enum AVCodecID [3]' Fixes: 69866/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-4971166119821312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 9b9e02f2ff6575e934e8e991a471b3086d1c0d53) Signed-off-by: Michael Niedermayer --- libavformat/iamf_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 0d80e6e725..3eb36f56f5 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -152,7 +152,7 @@ static int ipcm_decoder_config(IAMFCodecConfig *codec_config, }; int sample_format = avio_r8(pb); // 0 = BE, 1 = LE int sample_size = (avio_r8(pb) / 8 - 2); // 16, 24, 32 - if (sample_format > 1 || sample_size > 2 || codec_config->audio_roll_distance) + if (sample_format > 1 || sample_size > 2U || codec_config->audio_roll_distance) return AVERROR_INVALIDDATA; codec_config->codec_id = sample_fmt[sample_format][sample_size];