eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-18 13:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/cook: Enlarge gain table

Browse Source 
Fixes: index 25 out of bounds for type 'float [23]'
Fixes: 18355/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_COOK_fuzzer-5641398941908992

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 50001cd440)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-10-23 19:59:57 +02:00
parent e67955dcc6
commit 9fa00a6ade
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/cook.c
View File

@@ -143,7 +143,7 @@ typedef struct cook {
/* generate tables and related variables */ /* generate tables and related variables */
int gain_size_factor; int gain_size_factor;
float gain_table[23]; float gain_table[31];
/* data buffers */ /* data buffers */
@@ -185,8 +185,8 @@ static av_cold void init_gain_table(COOKContext *q)
{ {
int i; int i;
q->gain_size_factor = q->samples_per_channel / 8; q->gain_size_factor = q->samples_per_channel / 8;
for (i = 0; i < 23; i++) for (i = 0; i < 31; i++)
q->gain_table[i] = pow(pow2tab[i + 52], q->gain_table[i] = pow(pow2tab[i + 48],
(1.0 / (double) q->gain_size_factor)); (1.0 / (double) q->gain_size_factor));
} }
@@ -670,7 +670,7 @@ static void interpolate_float(COOKContext *q, float *buffer,
for (i = 0; i < q->gain_size_factor; i++) for (i = 0; i < q->gain_size_factor; i++)
buffer[i] *= fc1; buffer[i] *= fc1;
} else { // smooth gain } else { // smooth gain
fc2 = q->gain_table[11 + (gain_index_next - gain_index)]; fc2 = q->gain_table[15 + (gain_index_next - gain_index)];
for (i = 0; i < q->gain_size_factor; i++) { for (i = 0; i < q->gain_size_factor; i++) {
buffer[i] *= fc1; buffer[i] *= fc1;
fc1 *= fc2; fc1 *= fc2;