diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-07 10:58:25 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-27 07:20:59 +0100 |
| commit | 6ab290e20a55eead17d6fd21c031028f101c9662 (patch) | |
| tree | f1228306e9e8c4419a9c3b5058e57304b6888b6a | |
| parent | 515aa63e4dd76a96022df04b07823b568c5fef65 (diff) | |
| download | ffmpeg-6ab290e20a55eead17d6fd21c031028f101c9662.tar.gz | |
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>
(cherry picked from commit 2ccbc40eefd22a6aac1e543ea849951e159f4d8a)
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 83229f620a..dc036653c2 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); |