mirror of
https://github.com/librempeg/librempeg
synced 2024-11-22 00:51:37 +00:00
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. Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
e588ee749f
commit
167125067d
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user