diff mbox

[FFmpeg-devel] avcodec/mpeg4videodec: Clear mcsel before decoding an image

Message ID 20170806123829.18433-1-michael@niedermayer.cc
State Accepted
Commit 7735ed29741d985e1e670249ca56e7a1ce18b729
Headers show

Commit Message

Michael Niedermayer Aug. 6, 2017, 12:38 p.m. UTC
Fixes: runtime error: signed integer overflow: 2146467840 + 1032192 cannot be represented in type 'int'
Fixes: 2826/clusterfuzz-testcase-minimized-5901511613743104

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

Comments

Michael Niedermayer Aug. 11, 2017, 10:06 a.m. UTC | #1
On Sun, Aug 06, 2017 at 02:38:29PM +0200, Michael Niedermayer wrote:
> Fixes: runtime error: signed integer overflow: 2146467840 + 1032192 cannot be represented in type 'int'
> Fixes: 2826/clusterfuzz-testcase-minimized-5901511613743104
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mpeg4videodec.c | 1 +
>  1 file changed, 1 insertion(+)

applied

[...]
diff mbox

Patch

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 89c4b367f7..8f85e9362d 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2290,6 +2290,7 @@  static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
     int time_incr, time_increment;
     int64_t pts;
 
+    s->mcsel       = 0;
     s->pict_type = get_bits(gb, 2) + AV_PICTURE_TYPE_I;        /* pict type: I = 0 , P = 1 */
     if (s->pict_type == AV_PICTURE_TYPE_B && s->low_delay &&
         ctx->vol_control_parameters == 0 && !(s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY)) {