OSDN Git Service

avcodec/mpeg4videodec: Fix runtime error: shift exponent -2 is negative
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Feb 2017 20:33:27 +0000 (21:33 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Feb 2017 20:49:03 +0000 (21:49 +0100)
Fixes: 612/clusterfuzz-testcase-4707817137111040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mpeg4videodec.c

index 0e549ef..58ae05f 100644 (file)
@@ -367,6 +367,12 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g
     } else {
         int shift_y = 16 - ctx->sprite_shift[0];
         int shift_c = 16 - ctx->sprite_shift[1];
+
+        if (shift_c < 0 || shift_y < 0) {
+            avpriv_request_sample(s->avctx, "Too large sprite shift");
+            return AVERROR_PATCHWELCOME;
+        }
+
         for (i = 0; i < 2; i++) {
             s->sprite_offset[0][i] *= 1 << shift_y;
             s->sprite_offset[1][i] *= 1 << shift_c;