aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-10 23:09:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-08-15 01:26:21 +0200
commitc4a88fb546b64179aff12c169239285932e570ac (patch)
treeefe1a210f71eda3e20bef558acd881e9ed096357
parent59744637673d4fc1974e24f5a8e0137d104e16a1 (diff)
downloadffmpeg-c4a88fb546b64179aff12c169239285932e570ac.tar.gz
avcodec/ffwavesynth: Fix integer overflow for some corner case values
Fixes: left shift of negative value -14671840 Fixes: 16000/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFWAVESYNTH_fuzzer-5145977817661440 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/ffwavesynth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c
index b319b3341a..e6d2606c2f 100644
--- a/libavcodec/ffwavesynth.c
+++ b/libavcodec/ffwavesynth.c
@@ -301,8 +301,8 @@ static int wavesynth_parse_extradata(AVCodecContext *avc)
default:
return AVERROR(EINVAL);
}
- in->amp0 = (int64_t)a1 << 32;
- in->damp = (((int64_t)a2 << 32) - ((int64_t)a1 << 32)) / dt;
+ in->amp0 = (uint64_t)a1 << 32;
+ in->damp = (int64_t)(((uint64_t)a2 << 32) - ((uint64_t)a1 << 32)) / dt;
}
if (edata != edata_end)
return AVERROR(EINVAL);