summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-07 10:58:25 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-16 22:11:53 +0100
commit2ccbc40eefd22a6aac1e543ea849951e159f4d8a (patch)
tree61ac3c6287c1945b71b9016243dc7b6425e134de /libavcodec
parente0f5086fabe6feef362b9398a41ef30de07a08ee (diff)
avcodec/frame_thread_encoder: Fix segfault on allocation error
Fixes a segfault from av_fifo_size(NULL) that happens in ff_frame_thread_encoder_free if the fifo couldn't be allocted; furthermore the mutexes and conditions that are destroyed in ff_frame_thread_encoder_free are not even initialized at this point, so don't call said function. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/frame_thread_encoder.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index ee289c90e3..9ca34e7ffb 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -182,8 +182,10 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
c->parent_avctx = avctx;
c->task_fifo = av_fifo_alloc_array(BUFFER_SIZE, sizeof(Task));
- if(!c->task_fifo)
- goto fail;
+ if (!c->task_fifo) {
+ av_freep(&avctx->internal->frame_thread_encoder);
+ return AVERROR(ENOMEM);
+ }
pthread_mutex_init(&c->task_fifo_mutex, NULL);
pthread_mutex_init(&c->finished_task_mutex, NULL);