aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-05-28 00:05:16 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-29 19:40:36 +0200
commit9d24f293e754da8ed41e1aab7406420bc59a9731 (patch)
treea285ef55c1813e23b4fabfa301e3d53bb3fb18e5
parent83fa39eb06d0d720422e8a5408d15ba472a82ea6 (diff)
downloadffmpeg-9d24f293e754da8ed41e1aab7406420bc59a9731.tar.gz
avcodec/adpcm_data: extend ff_adpcm_ima_cunning_index_table
Fixes: overread by 1 Fixes: 21880/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_CUNNING_fuzzer-5717917221257216.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/adpcm_data.c4
-rw-r--r--libavcodec/adpcm_data.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/adpcm_data.c b/libavcodec/adpcm_data.c
index cb9d20948e..e34e04d5e9 100644
--- a/libavcodec/adpcm_data.c
+++ b/libavcodec/adpcm_data.c
@@ -178,8 +178,8 @@ const int16_t ff_adpcm_mtaf_stepsize[32][16] = {
-424, -1273, -2121, -2970, -3819, -4668, -5516, -6365, },
};
-const int8_t ff_adpcm_ima_cunning_index_table[8] = {
- -1, -1, -1, -1, 1, 2, 3, 4,
+const int8_t ff_adpcm_ima_cunning_index_table[9] = {
+ -1, -1, -1, -1, 1, 2, 3, 4, -1
};
const int16_t ff_adpcm_ima_cunning_step_table[61] = {
diff --git a/libavcodec/adpcm_data.h b/libavcodec/adpcm_data.h
index fa8a03ee1f..d678bfc71a 100644
--- a/libavcodec/adpcm_data.h
+++ b/libavcodec/adpcm_data.h
@@ -42,7 +42,7 @@ extern const int16_t ff_adpcm_yamaha_indexscale[];
extern const int8_t ff_adpcm_yamaha_difflookup[];
extern const int16_t ff_adpcm_afc_coeffs[2][16];
extern const int16_t ff_adpcm_mtaf_stepsize[32][16];
-extern const int8_t ff_adpcm_ima_cunning_index_table[8];
+extern const int8_t ff_adpcm_ima_cunning_index_table[9];
extern const int16_t ff_adpcm_ima_cunning_step_table[61];
#endif /* AVCODEC_ADPCM_DATA_H */