From 61b055bed0968d60eb24a5080fb4ba2bcf73b753 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 27 Aug 2019 17:21:00 +0200 Subject: [PATCH] libavcodec/utils: Free threads on init failure Fixes: Multiple memleaks Fixes: ffmpeg-memory-leak Found-by: Francis Provencher Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a6a646636d..729c10a8ed 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1029,6 +1029,9 @@ free_and_end: (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP))) avctx->codec->close(avctx); + if (HAVE_THREADS && avctx->internal->thread_ctx) + ff_thread_free(avctx); + if (codec->priv_class && codec->priv_data_size) av_opt_free(avctx->priv_data); av_opt_free(avctx);