har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/frame_thread_encoder: Free AVCodecContext structure on error during init

Browse Source 
Fixes: MemLeak
Fixes: 8281
Fixes: PoC_option158.jpg
Fixes: CVE-2020-22037

Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7bba0dd6382e30d646cb406034a66199e071d713)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-08-14 09:55:00 +02:00
parent f6f682f5aa
commit 4254dbe20f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/frame_thread_encoder.c
View File

@ -124,7 +124,7 @@ end:
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
int i=0; int i=0;
ThreadContext *c; ThreadContext *c;
AVCodecContext *thread_avctx = NULL;
if( !(avctx->thread_type & FF_THREAD_FRAME) if( !(avctx->thread_type & FF_THREAD_FRAME)
|| !(avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS)) || !(avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS))
@ -205,16 +205,17 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
AVDictionary *tmp = NULL; AVDictionary *tmp = NULL;
int ret; int ret;
void *tmpv; void *tmpv;
AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec); thread_avctx = avcodec_alloc_context3(avctx->codec);
if(!thread_avctx) if(!thread_avctx)
goto fail; goto fail;
tmpv = thread_avctx->priv_data; tmpv = thread_avctx->priv_data;
*thread_avctx = *avctx; *thread_avctx = *avctx;
thread_avctx->priv_data = tmpv;
thread_avctx->internal = NULL;
thread_avctx->hw_frames_ctx = NULL;
ret = av_opt_copy(thread_avctx, avctx); ret = av_opt_copy(thread_avctx, avctx);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
thread_avctx->priv_data = tmpv;
thread_avctx->internal = NULL;
if (avctx->codec->priv_class) { if (avctx->codec->priv_class) {
int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data);
if (ret < 0) if (ret < 0)
@ -243,6 +244,8 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
return 0; return 0;
fail: fail:
avcodec_close(thread_avctx);
av_freep(&thread_avctx);
avctx->thread_count = i; avctx->thread_count = i;
av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n"); av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n");
ff_frame_thread_encoder_free(avctx); ff_frame_thread_encoder_free(avctx);

4
libavcodec/frame_thread_encoder.h
View File

@ -23,6 +23,10 @@
#include "avcodec.h" #include "avcodec.h"
/**
* Initialize frame thread encoder.
* @note hardware encoders are not supported
*/
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options); int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options);
void ff_frame_thread_encoder_free(AVCodecContext *avctx); void ff_frame_thread_encoder_free(AVCodecContext *avctx);
int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt,