diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-18 17:46:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:34 +0200 |
| commit | 860ff3c4475263aa01d09585371a60fcefbeebd2 (patch) | |
| tree | 7423ae3f419ac5877a4f2fc73dbc150bf6ce7ec3 | |
| parent | 1397c7f6160b0e6fbca7c1949fb5007dc9d846f9 (diff) | |
| download | ffmpeg-860ff3c4475263aa01d09585371a60fcefbeebd2.tar.gz | |
avcodec/mimic: Use ff_set_dimensions() to set the dimensions
Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e434840fd4b3c854beec845f950b80bc1bf93b60)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mimic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 73e49aa847..8948d4e6c4 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -390,9 +390,11 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } + res = ff_set_dimensions(avctx, width, height); + if (res < 0) + return res; + ctx->avctx = avctx; - avctx->width = width; - avctx->height = height; avctx->pix_fmt = AV_PIX_FMT_YUV420P; for (i = 0; i < 3; i++) { ctx->num_vblocks[i] = FF_CEIL_RSHIFT(height, 3 + !!i); |