summaryrefslogtreecommitdiff
path: root/libavcodec/alsdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-07-06 23:20:30 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-07-21 11:26:36 +0200
commit9cd0d94f59d05e7bfaae9690e827752e7717eda3 (patch)
treefdd8f4d31336630f75e8f3944dbc0064762de494 /libavcodec/alsdec.c
parent240bf0e5960fca424e43b7ab1048897fdecabf26 (diff)
avcodec/alsdec: Fix 2 integer overflows
Fixes: signed integer overflow: 1270564968 + 904828220 cannot be represented in type 'int' Fixes: 15402/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-5755426823471104 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/alsdec.c')
-rw-r--r--libavcodec/alsdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 5eb2a58aaf..8201deb366 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -507,7 +507,7 @@ static void parcor_to_lpc(unsigned int k, const int32_t *par, int32_t *cof)
int i, j;
for (i = 0, j = k - 1; i < j; i++, j--) {
- int tmp1 = ((MUL64(par[k], cof[j]) + (1 << 19)) >> 20);
+ unsigned tmp1 = ((MUL64(par[k], cof[j]) + (1 << 19)) >> 20);
cof[j] += ((MUL64(par[k], cof[i]) + (1 << 19)) >> 20);
cof[i] += tmp1;
}
@@ -980,7 +980,7 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
y = 1 << 19;
for (sb = -opt_order; sb < 0; sb++)
- y += MUL64(lpc_cof[sb], raw_samples[sb]);
+ y += (uint64_t)MUL64(lpc_cof[sb], raw_samples[sb]);
*raw_samples -= y >> 20;
}