diff mbox

[FFmpeg-devel] avcodec/wavpack: Fix runtime error: left shift of negative value -2

Message ID 20170304035515.555-1-michael@niedermayer.cc
State Accepted
Commit ba150051322c02e24c004bd5309468886e1e5ab6
Headers show

Commit Message

Michael Niedermayer March 4, 2017, 3:55 a.m. UTC 
Fixes: 723/clusterfuzz-testcase-6471394663596032

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 March 5, 2017, 11:03 a.m. UTC | #1 
On Sat, Mar 04, 2017 at 04:55:15AM +0100, Michael Niedermayer wrote:
> Fixes: 723/clusterfuzz-testcase-6471394663596032
> 
> 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 ebcdd96508..fbbd57d40b 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -739,13 +739,13 @@  static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
             }
             for (i = 0; i < weights; i++) {
                 t = (int8_t)bytestream2_get_byte(&gb);
-                s->decorr[s->terms - i - 1].weightA = t << 3;
+                s->decorr[s->terms - i - 1].weightA = t * (1 << 3);
                 if (s->decorr[s->terms - i - 1].weightA > 0)
                     s->decorr[s->terms - i - 1].weightA +=
                         (s->decorr[s->terms - i - 1].weightA + 64) >> 7;
                 if (s->stereo_in) {
                     t = (int8_t)bytestream2_get_byte(&gb);
-                    s->decorr[s->terms - i - 1].weightB = t << 3;
+                    s->decorr[s->terms - i - 1].weightB = t * (1 << 3);
                     if (s->decorr[s->terms - i - 1].weightB > 0)
                         s->decorr[s->terms - i - 1].weightB +=
                             (s->decorr[s->terms - i - 1].weightB + 64) >> 7;