]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/ffwavesynth: Fix integer overflow in computation of ddphi
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Mar 2020 17:25:56 +0000 (18:25 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 18 Mar 2020 19:23:15 +0000 (20:23 +0100)
Fixes: signed integer overflow: 1302123111085380114 - -8319005078741256972 cannot be represented in type 'long'
Fixes: 20991/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFWAVESYNTH_fuzzer-5148554161291264
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/ffwavesynth.c

index b9c63abb8d9e3d8070f71241a02520ec32f5ddeb..998e1a4ad66e0963a1bc90cb6df2053193d4a981 100644 (file)
@@ -281,7 +281,7 @@ static int wavesynth_parse_extradata(AVCodecContext *avc)
                 dphi1 = frac64(f1, (int64_t)avc->sample_rate << 16);
                 dphi2 = frac64(f2, (int64_t)avc->sample_rate << 16);
                 in->dphi0 = dphi1;
-                in->ddphi = (dphi2 - dphi1) / dt;
+                in->ddphi = (int64_t)(dphi2 - (uint64_t)dphi1) / dt;
                 if (phi & 0x80000000) {
                     phi &= ~0x80000000;
                     if (phi >= i)