diff mbox

[FFmpeg-devel] avcodec/wavpack: Fix invalid shift

Message ID 20170627123322.7732-1-michael@niedermayer.cc
State Accepted
Commit c07af720984acaafaa273369080b458d73975775
Headers show

Commit Message

Michael Niedermayer June 27, 2017, 12:33 p.m. UTC
Fixes: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
Fixes: 2377/clusterfuzz-testcase-minimized-6108505935183872

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer July 4, 2017, 10:07 p.m. UTC | #1
On Tue, Jun 27, 2017 at 02:33:22PM +0200, Michael Niedermayer wrote:
> Fixes: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
> Fixes: 2377/clusterfuzz-testcase-minimized-6108505935183872
> 
> 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 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied

[...]
diff mbox

Patch

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index bc4b030425..a117e8aa81 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -846,9 +846,9 @@  static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
                 continue;
             }
             bytestream2_get_buffer(&gb, val, 4);
-            if (val[0] > 31) {
+            if (val[0] > 30) {
                 av_log(avctx, AV_LOG_ERROR,
-                       "Invalid INT32INFO, extra_bits = %d (> 32)\n", val[0]);
+                       "Invalid INT32INFO, extra_bits = %d (> 30)\n", val[0]);
                 continue;
             } else if (val[0]) {
                 s->extra_bits = val[0];