[FFmpeg-devel] [PATCH] avcodec/zmbv: Check that the buffer is large enough for mvec
Michael Niedermayer
michael at niedermayer.cc
Wed Nov 15 18:29:24 EET 2017
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 at niedermayer.cc>
---
libavcodec/zmbv.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index b09dc41ebd..f91d2e3931 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);
}
--
2.15.0
More information about the ffmpeg-devel
mailing list