aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-11-02 15:15:46 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-31 19:51:56 +0100
commit0ae9a8cdbbc35d8f63edb6f89234b34d29136ced (patch)
treec11329fd92f8827dc6a154362fcd6f7c3342e712
parentb56388541bc46488c85f8d648e202686bddba1f9 (diff)
downloadffmpeg-0ae9a8cdbbc35d8f63edb6f89234b34d29136ced.tar.gz
avcodec/wmavoice: Fix integer overflow in synth_frame()
Fixes: left shift of negative value -3 Fixes: 18518/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMAVOICE_fuzzer-6560514359951360 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 cf323f4d38f5756ecdb8fb4f72c80a8069da832e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/wmavoice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 4c147fe04f..5dd9b3dbb7 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -1523,7 +1523,7 @@ static int synth_frame(AVCodecContext *ctx, GetBitContext *gb, int frame_idx,
/* "pitch-diff-per-sample" for calculation of pitch per sample */
s->pitch_diff_sh16 =
- ((cur_pitch_val - s->last_pitch_val) << 16) / MAX_FRAMESIZE;
+ (cur_pitch_val - s->last_pitch_val) * (1 << 16) / MAX_FRAMESIZE;
}
/* Global gain (if silence) and pitch-adaptive window coordinates */