diff mbox

[FFmpeg-devel] avcodec/wavpack: Fix runtime error: signed integer overflow: 2147483642 + 512 cannot be represented in type 'int'

Message ID 20170510212821.21939-1-michael@niedermayer.cc
State Accepted
Commit 48f7757749564dac8ad68d11fca13d0739aa2304
Headers show

Commit Message

Michael Niedermayer May 10, 2017, 9:28 p.m. UTC 
Fixed: 1453/clusterfuzz-testcase-minimized-5024976874766336

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/wavpack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer May 13, 2017, 4:06 p.m. UTC | #1 
On Wed, May 10, 2017 at 11:28:21PM +0200, Michael Niedermayer wrote:
> Fixed: 1453/clusterfuzz-testcase-minimized-5024976874766336
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/wavpack.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied

[...]
diff mbox

Patch

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index d2ba97ee2c..87c065c1e7 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -433,8 +433,8 @@  static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
                     L2 = L + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
                     R2 = R + ((s->decorr[i].weightB * (int64_t)B + 512) >> 10);
                 } else {
-                    L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
-                    R2 = R + ((s->decorr[i].weightB * B + 512) >> 10);
+                    L2 = L + ((int)(s->decorr[i].weightA * A + 512U) >> 10);
+                    R2 = R + ((int)(s->decorr[i].weightB * B + 512U) >> 10);
                 }
                 if (A && L)
                     s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;