aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-06-13 15:00:14 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-02 19:41:48 +0100
commit1df86144e0866ff0a8e18e002ea65453d6bf51a8 (patch)
tree589cc849523982ed05d59d68fbcc937be77c400d
parent5a7a2180f8d5a013c73b6c590062dfa7a5aeedeb (diff)
downloadffmpeg-1df86144e0866ff0a8e18e002ea65453d6bf51a8.tar.gz
avcodec/aacpsdsp_template: Fix integer overflow in ps_hybrid_analysis_c()
Fixes: signed integer overflow: -1539565182 + -798086761 cannot be represented in type 'int' Fixes: 14807/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-564925382682214 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 f8f5668df590d853429586e1f95cbd9cee38920e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/aacpsdsp_template.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aacpsdsp_template.c b/libavcodec/aacpsdsp_template.c
index 3049ce8b79..b555de886c 100644
--- a/libavcodec/aacpsdsp_template.c
+++ b/libavcodec/aacpsdsp_template.c
@@ -54,10 +54,10 @@ static void ps_hybrid_analysis_c(INTFLOAT (*out)[2], INTFLOAT (*in)[2],
INT64FLOAT sum_im = (INT64FLOAT)filter[i][6][0] * in[6][1];
for (j = 0; j < 6; j++) {
- INTFLOAT in0_re = in[j][0];
- INTFLOAT in0_im = in[j][1];
- INTFLOAT in1_re = in[12-j][0];
- INTFLOAT in1_im = in[12-j][1];
+ INT64FLOAT in0_re = in[j][0];
+ INT64FLOAT in0_im = in[j][1];
+ INT64FLOAT in1_re = in[12-j][0];
+ INT64FLOAT in1_im = in[12-j][1];
sum_re += (INT64FLOAT)filter[i][j][0] * (in0_re + in1_re) -
(INT64FLOAT)filter[i][j][1] * (in0_im - in1_im);
sum_im += (INT64FLOAT)filter[i][j][0] * (in0_im + in1_im) +