aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-12-14 00:37:27 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-15 01:00:34 +0100
commitf064c7c449f162a9011ad890f26ceeca26934d22 (patch)
tree756f4bfedec87feb5e3b6aec66e64bb2a606452b
parent1f8e43938bc2cc43ab1a875456aea373e0b587b9 (diff)
downloadffmpeg-f064c7c449f162a9011ad890f26ceeca26934d22.tar.gz
avcodec/mp3_header_decompress_bsf: Check sample_rate_index
Fixes: out of array read Fixes: 19309/clusterfuzz-testcase-minimized-ffmpeg_BSF_MP3_HEADER_DECOMPRESS_fuzzer-5651002950942720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mp3_header_decompress_bsf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c
index 294858953c..ab3d420300 100644
--- a/libavcodec/mp3_header_decompress_bsf.c
+++ b/libavcodec/mp3_header_decompress_bsf.c
@@ -62,6 +62,11 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out)
lsf = sample_rate < (24000+32000)/2;
mpeg25 = sample_rate < (12000+16000)/2;
sample_rate_index= (header>>10)&3;
+ if (sample_rate_index == 3) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
sample_rate= avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25); //in case sample rate is a little off
for(bitrate_index=2; bitrate_index<30; bitrate_index++){