diff mbox

[FFmpeg-devel,1/3] avcodec/mpeg12dec: Fix runtime error: left shift of negative value -1

Message ID 20170312020406.18387-1-michael@niedermayer.cc
State Accepted
Commit a720b854b0d3f0fae2b1eac644dd39e5821cacb1
Headers show

Commit Message

Michael Niedermayer March 12, 2017, 2:04 a.m. UTC 
Fixes: 764/clusterfuzz-testcase-6273034652483584

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

Comments

Michael Niedermayer March 13, 2017, 3:47 a.m. UTC | #1 
On Sun, Mar 12, 2017 at 03:04:04AM +0100, Michael Niedermayer wrote:
> Fixes: 764/clusterfuzz-testcase-6273034652483584
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mpeg12dec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied

[...]
diff mbox

Patch

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 27db14c35e..e49167f89e 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -994,7 +994,7 @@  static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
 
             cbp = get_vlc2(&s->gb, ff_mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
             if (mb_block_count > 6) {
-                cbp <<= mb_block_count - 6;
+                cbp *= 1 << mb_block_count - 6;
                 cbp  |= get_bits(&s->gb, mb_block_count - 6);
                 s->bdsp.clear_blocks(s->block[6]);
             }