diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-15 21:52:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-02 19:41:48 +0100 |
| commit | b9be7f3adf0b53ae0d07e55529736fa3c2af3b1d (patch) | |
| tree | 10b50b853a339c8c7fdd2e9989d188d710ba8bdc /libavcodec | |
| parent | 990753e81f2d3c369b262ec634b844e1b6908d23 (diff) | |
| download | ffmpeg-b9be7f3adf0b53ae0d07e55529736fa3c2af3b1d.tar.gz | |
avcodec/bink: Reorder operations in init to avoid memleak on error
Fixes: Direct leak of 536 byte(s) in 1 object(s)
Fixes: 15266/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-5629530426834944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2603f25d326476a83f5d093b522590b05b6e703b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 131eaa16f7..f24acaed64 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1299,13 +1299,13 @@ static av_cold int decode_init(AVCodecContext *avctx) } c->avctx = avctx; + if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0) + return ret; + c->last = av_frame_alloc(); if (!c->last) return AVERROR(ENOMEM); - if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0) - return ret; - avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P; ff_blockdsp_init(&c->bdsp, avctx); |