diff options
| author | Michael Niedermayer <[email protected]> | 2018-01-15 19:03:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2018-04-13 00:35:15 +0200 |
| commit | a9fb2f8c80d4c76854773bf654175573942312a9 (patch) | |
| tree | d9cd86e49a61d8fce68b244336972acc24d5dcc8 | |
| parent | 488a6ae7e5e8ffbcddcdda62174b898bbe6a8b4d (diff) | |
avcodec/ulti: Check number of blocks at init
Fixes: Timeout
Fixes: 4832/clusterfuzz-testcase-4699096590843904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 725353525e73bbe5b6b4d01528252675f2417a02)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/ulti.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index e6f4374981..9e4c088b10 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -50,6 +50,8 @@ static av_cold int ulti_decode_init(AVCodecContext *avctx) s->width = avctx->width; s->height = avctx->height; s->blocks = (s->width / 8) * (s->height / 8); + if (s->blocks == 0) + return AVERROR_INVALIDDATA; avctx->pix_fmt = AV_PIX_FMT_YUV410P; s->ulti_codebook = ulti_codebook; |