godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94832 from alvinhochun/workerthreadpool-uaf 

Fix use-after-free in WorkerThreadPool
This commit is contained in:
Rémi Verschelde 2024-07-29 15:17:29 +02:00
parent 9a8f18b9bf c9f4436073
commit 5793d79ec5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/object/worker_thread_pool.cpp
View File

@ -83,6 +83,10 @@ void WorkerThreadPool::_process_task(Task *p_task) {
} }
#endif #endif
#ifdef THREADS_ENABLED
bool low_priority = p_task->low_priority;
#endif
if (p_task->group) { if (p_task->group) {
// Handling a group // Handling a group
bool do_post = false; bool do_post = false;
@ -159,7 +163,7 @@ void WorkerThreadPool::_process_task(Task *p_task) {
#ifdef THREADS_ENABLED #ifdef THREADS_ENABLED
{ {
curr_thread.current_task = prev_task; curr_thread.current_task = prev_task;
if (p_task->low_priority) { if (low_priority) {
low_priority_threads_used--; low_priority_threads_used--;
if (_try_promote_low_priority_task()) { if (_try_promote_low_priority_task()) {