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

2017-03-12 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Mar 12 03:04:04 2017 +0100| [a720b854b0d3f0fae2b1eac644dd39e5821cacb1] | 
committer: Michael Niedermayer

avcodec/mpeg12dec: Fix runtime error: left shift of negative value -1

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 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a720b854b0d3f0fae2b1eac644dd39e5821cacb1
---

 libavcodec/mpeg12dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 27db14c..e49167f 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(>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(>gb, mb_block_count - 6);
 s->bdsp.clear_blocks(s->block[6]);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] avcodec/mpeg12dec: Fix runtime error: left shift of negative value -13

2017-03-04 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Fri 
Mar  3 04:39:05 2017 +0100| [d757ddbaab8f03b3664788e620314b70ac791319] | 
committer: Michael Niedermayer

avcodec/mpeg12dec: Fix runtime error: left shift of negative value -13

Fixes: 709/clusterfuzz-testcase-4789836449841152

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d757ddbaab8f03b3664788e620314b70ac791319
---

 libavcodec/mpeg12dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index d44ddb2..27db14c 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -497,7 +497,7 @@ static inline int mpeg2_decode_block_intra(MpegEncContext 
*s,
 dc  = s->last_dc[component];
 dc += diff;
 s->last_dc[component] = dc;
-block[0] = dc << (3 - s->intra_dc_precision);
+block[0] = dc * (1 << (3 - s->intra_dc_precision));
 ff_tlog(s->avctx, "dc=%d\n", block[0]);
 mismatch = block[0] ^ 1;
 i = 0;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


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

2017-02-26 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Feb 25 21:07:24 2017 +0100| [aff8cf18cb0b1fa4f2e3d163c3da2f25aa6d1906] | 
committer: Michael Niedermayer

avcodec/mpeg12dec: Fix runtime error: left shift of negative value -2

671/clusterfuzz-testcase-4990381827555328

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aff8cf18cb0b1fa4f2e3d163c3da2f25aa6d1906
---

 libavcodec/mpeg12dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 5f86029..d44ddb2 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;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] avcodec/mpeg12dec: Fix runtime error: left shift of negative value

2017-02-19 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Feb 19 18:47:13 2017 +0100| [706757d26dd5e606c1745a4bb53fe45f6d6493cf] | 
committer: Michael Niedermayer

avcodec/mpeg12dec: Fix runtime error: left shift of negative value

Fixes: 608/clusterfuzz-testcase-603978286392934

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=706757d26dd5e606c1745a4bb53fe45f6d6493cf
---

 libavcodec/mpeg12dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index f3cf6eb..5f86029 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -865,8 +865,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t 
block[12][64])
s->last_mv[i][0][1]);
 /* full_pel: only for MPEG-1 */
 if (s->full_pel[i]) {
-s->mv[i][0][0] <<= 1;
-s->mv[i][0][1] <<= 1;
+s->mv[i][0][0] *= 2;
+s->mv[i][0][1] *= 2;
 }
 }
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog