diff mbox series

[FFmpeg-devel,2/8] avcodec/frame_thread_encoder: Fix segfault on allocation error

Message ID 20210208122330.555354-2-andreas.rheinhardt@gmail.com
State Accepted
Commit 2ccbc40eefd22a6aac1e543ea849951e159f4d8a
Headers show
Series [FFmpeg-devel,1/8] avcodec/frame_thread_encoder: Improve type safety | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Feb. 8, 2021, 12:23 p.m. UTC 
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.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/frame_thread_encoder.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Paul B Mahol Feb. 8, 2021, 12:28 p.m. UTC | #1 
probably ok
diff mbox series

Patch

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);