Merge pull request #93709 from RandomShaper/fix_antilock_bad_mutex

WorkerThreadPool: Fix wrong pointer used in the case of BinaryMutex
godotengine · Jun 29, 2024 · d6385d7 · d6385d7
2 parents 0b23be9 + f2f9a6b
commit d6385d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/object/worker_thread_pool.cpp b/core/object/worker_thread_pool.cpp
@@ -427,7 +427,7 @@ void WorkerThreadPool::_lock_unlockable_mutexes() {
  if ((((uintptr_t)unlockable_mutexes[i]) & 1) == 0) {
  ((Mutex *)unlockable_mutexes[i])->lock();
  } else {
- ((BinaryMutex *)unlockable_mutexes[i])->lock();
+ ((BinaryMutex *)(unlockable_mutexes[i] & ~1))->lock();
  }
  }
  }
@@ -441,7 +441,7 @@ void WorkerThreadPool::_unlock_unlockable_mutexes() {
  if ((((uintptr_t)unlockable_mutexes[i]) & 1) == 0) {
  ((Mutex *)unlockable_mutexes[i])->unlock();
  } else {
- ((BinaryMutex *)unlockable_mutexes[i])->unlock();
+ ((BinaryMutex *)(unlockable_mutexes[i] & ~1))->unlock();
  }
  }
  }