aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-05-25 22:02:20 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-06-15 22:31:13 +0200
commitaf0ba288e7a80872aa8893f867de96a8a686016d (patch)
tree44d58017038d548242ed429f8f4e487e2ff61130 /libavcodec
parentc98d84e2299c710e20133e63848bbce18bfe5b3e (diff)
downloadffmpeg-af0ba288e7a80872aa8893f867de96a8a686016d.tar.gz
oavcodec/aacpsdsp_template: Use unsigned for hs0X to prevent undefined behavior
Fixes: signed integer overflow: 1073741842 + 1784008138 cannot be represented in type 'int' Fixes: 6792/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5677589835284480 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 62cb6fadf33de6db386deac92853d4b95c930015) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-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 19be200653..65867649c7 100644
--- a/libavcodec/aacpsdsp_template.c
+++ b/libavcodec/aacpsdsp_template.c
@@ -181,10 +181,10 @@ static void ps_stereo_interpolate_ipdopd_c(INTFLOAT (*l)[2], INTFLOAT (*r)[2],
INTFLOAT h01 = h[0][1], h11 = h[1][1];
INTFLOAT h02 = h[0][2], h12 = h[1][2];
INTFLOAT h03 = h[0][3], h13 = h[1][3];
- INTFLOAT hs00 = h_step[0][0], hs10 = h_step[1][0];
- INTFLOAT hs01 = h_step[0][1], hs11 = h_step[1][1];
- INTFLOAT hs02 = h_step[0][2], hs12 = h_step[1][2];
- INTFLOAT hs03 = h_step[0][3], hs13 = h_step[1][3];
+ UINTFLOAT hs00 = h_step[0][0], hs10 = h_step[1][0];
+ UINTFLOAT hs01 = h_step[0][1], hs11 = h_step[1][1];
+ UINTFLOAT hs02 = h_step[0][2], hs12 = h_step[1][2];
+ UINTFLOAT hs03 = h_step[0][3], hs13 = h_step[1][3];
int n;
for (n = 0; n < len; n++) {