diff mbox

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

Message ID 20170225200726.7928-3-michael@niedermayer.cc
State Accepted
Commit aff8cf18cb0b1fa4f2e3d163c3da2f25aa6d1906
Headers show

Commit Message

Michael Niedermayer Feb. 25, 2017, 8:07 p.m. UTC
671/clusterfuzz-testcase-4990381827555328

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

Comments

Paul B Mahol Feb. 25, 2017, 9:01 p.m. UTC | #1
On 2/25/17, Michael Niedermayer <michael@niedermayer.cc> wrote:
> 671/clusterfuzz-testcase-4990381827555328
>
> 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 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>

lgtm
Michael Niedermayer Feb. 26, 2017, 3:33 p.m. UTC | #2
On Sat, Feb 25, 2017 at 10:01:17PM +0100, Paul B Mahol wrote:
> On 2/25/17, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > 671/clusterfuzz-testcase-4990381827555328
> >
> > 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 | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> 
> lgtm

applied

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 5f86029660..d44ddb20fa 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -948,8 +948,8 @@  static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
                         dmy = get_dmv(s);
 
 
-                        s->last_mv[i][0][1] = my << my_shift;
-                        s->last_mv[i][1][1] = my << my_shift;
+                        s->last_mv[i][0][1] = my * (1 << my_shift);
+                        s->last_mv[i][1][1] = my * (1 << my_shift);
 
                         s->mv[i][0][0] = mx;
                         s->mv[i][0][1] = my;