diff options
author | Zhao Zhili <zhilizhao@tencent.com> | 2024-07-08 20:13:37 +0800 |
---|---|---|
committer | Nuo Mi <nuomi2021@gmail.com> | 2024-07-11 20:26:23 +0800 |
commit | 906b883e7beafdd78e32563ed7a5033995362751 (patch) | |
tree | 003e0c1d997ba518fbfa550a5644ce8fa9e12384 | |
parent | 54f9469fa173394ef3a19d8c6e700bca0b8fde81 (diff) | |
download | ffmpeg-906b883e7beafdd78e32563ed7a5033995362751.tar.gz |
avutil/executor: Fix stack overflow due to recursive call
av_executor_execute run the task directly when thread is disabled.
The task can schedule a new task by call av_executor_execute. This
forms an implicit recursive call. This patch removed the recursive
call.
-rw-r--r-- | libavutil/executor.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavutil/executor.c b/libavutil/executor.c index 89058fab2f..bfce2ac444 100644 --- a/libavutil/executor.c +++ b/libavutil/executor.c @@ -20,6 +20,8 @@ #include "config.h" +#include <stdbool.h> + #include "mem.h" #include "thread.h" @@ -49,6 +51,7 @@ typedef struct ThreadInfo { struct AVExecutor { AVTaskCallbacks cb; int thread_count; + bool recursive; ThreadInfo *threads; uint8_t *local_contexts; @@ -207,8 +210,12 @@ void av_executor_execute(AVExecutor *e, AVTask *t) } if (!e->thread_count || !HAVE_THREADS) { + if (e->recursive) + return; + e->recursive = true; // We are running in a single-threaded environment, so we must handle all tasks ourselves while (run_one_task(e, e->local_contexts)) /* nothing */; + e->recursive = false; } } |