diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-04 17:49:16 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-27 07:20:57 +0100 |
| commit | 7f1f850f11766be9dd2a03caa19f6d1e85c7793c (patch) | |
| tree | 0c88c4755567d1a98fb8f56ce700e02d2f2c3dc1 | |
| parent | c71de42131a524a3d9fa69209f899e84734cf1bc (diff) | |
| download | ffmpeg-7f1f850f11766be9dd2a03caa19f6d1e85c7793c.tar.gz | |
avcodec/bink: Fix memleak upon init failure
The init function first allocates an AVFrame and then some buffers; if
one of the buffers couldn't be allocated, the AVFrame leaks. Solve this
by setting the FF_CODEC_CAP_INIT_CLEANUP flag.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 4f672889481e7b3dc03c04b02a86836e94104e63)
| -rw-r--r-- | libavcodec/bink.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index f251ab4017..c7ef333bd4 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1381,10 +1381,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_hpeldsp_init(&c->hdsp, avctx->flags); ff_binkdsp_init(&c->binkdsp); - if ((ret = init_bundles(c)) < 0) { - free_bundles(c); + if ((ret = init_bundles(c)) < 0) return ret; - } if (c->version == 'b') { if (!binkb_initialised) { @@ -1424,4 +1422,5 @@ AVCodec ff_bink_decoder = { .decode = decode_frame, .flush = flush, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; |