diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-11-15 17:11:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-31 22:56:14 +0100 |
| commit | 90ad2798ae71596dd396d556f36235c30e76c0f6 (patch) | |
| tree | 3aafc3777f67fb246d2029890e69429fc5504e6e | |
| parent | 813d7f4972333ea6d09c2978cfffc93c4d5e343f (diff) | |
| download | ffmpeg-90ad2798ae71596dd396d556f36235c30e76c0f6.tar.gz | |
avcodec/zmbv: Check that the buffer is large enough for mvec
Fixes: Timeout
Fixes: 4143/clusterfuzz-testcase-4736864637419520
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2ab9568a2c3349039eec29fb960fe39de354b514)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/zmbv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 25a1cd215d..39a08db0eb 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -539,6 +539,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac } else { frame->key_frame = 0; frame->pict_type = AV_PICTURE_TYPE_P; + if (c->decomp_len < 2LL * ((c->width + c->bw - 1) / c->bw) * ((c->height + c->bh - 1) / c->bh)) + return AVERROR_INVALIDDATA; if (c->decomp_len) c->decode_xor(c); } |