diff mbox

[FFmpeg-devel,2/3] avcodec/wavpack: Fix integer overflow in wv_unpack_stereo()

Message ID 20180427194407.24276-2-michael@niedermayer.cc
State Accepted
Commit da038c07f02dfc10380001c11b3d047eca7cb8c9
Headers show

Commit Message

Michael Niedermayer April 27, 2018, 7:44 p.m. UTC
Fixes: runtime error: signed integer overflow: 2147483531 + 16384 cannot be represented in type 'int'
Fixes: 6615/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5165715515506688

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

Comments

Michael Niedermayer April 29, 2018, 2:43 p.m. UTC | #1
On Fri, Apr 27, 2018 at 09:44:06PM +0200, Michael Niedermayer wrote:
> Fixes: runtime error: signed integer overflow: 2147483531 + 16384 cannot be represented in type 'int'
> Fixes: 6615/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5165715515506688
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/wavpack.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 0e40b29879..22a2c83a30 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -452,7 +452,7 @@  static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
                 if (type != AV_SAMPLE_FMT_S16P)
                     R2 = R + ((s->decorr[i].weightB * (int64_t)L2 + 512) >> 10);
                 else
-                    R2 = R + ((int)(s->decorr[i].weightB * (unsigned)L2 + 512) >> 10);
+                    R2 = R + (unsigned)((int)(s->decorr[i].weightB * (unsigned)L2 + 512) >> 10);
                 UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, L2, R);
                 R                        = R2;
                 s->decorr[i].samplesA[0] = R;