virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avutil/executor: Fix stack overflow due to recursive call

Browse Source 
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.
This commit is contained in:
Zhao Zhili 2024-07-08 20:13:37 +08:00 committed by Nuo Mi
parent 54f9469fa1
commit 906b883e7b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/executor.c
View File

@ -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;
}
}