mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: potential check of thread-shared field evades lock acquisition

pull/13818/head
Rubidium 2025-03-14 20:08:24 +01:00
parent ac2087a3eb
commit f57b6248a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/smallstack_type.hpp
View File

@ -191,8 +191,8 @@ public:
*/ */
inline void Push(const Titem &item) inline void Push(const Titem &item)
{ {
if (this->value != Tinvalid) {
std::lock_guard<std::mutex> lock(SmallStack::GetPool().GetMutex()); std::lock_guard<std::mutex> lock(SmallStack::GetPool().GetMutex());
if (this->value != Tinvalid) {
Tindex new_item = SmallStack::GetPool().Create(); Tindex new_item = SmallStack::GetPool().Create();
if (new_item != Tmax_size) { if (new_item != Tmax_size) {
PooledSmallStack &pushed = SmallStack::GetPool().Get(new_item); PooledSmallStack &pushed = SmallStack::GetPool().Get(new_item);
@ -211,11 +211,11 @@ public:
*/ */
inline Titem Pop() inline Titem Pop()
{ {
std::lock_guard<std::mutex> lock(SmallStack::GetPool().GetMutex());
Titem ret = this->value; Titem ret = this->value;
if (this->next == Tmax_size) { if (this->next == Tmax_size) {
this->value = Tinvalid; this->value = Tinvalid;
} else { } else {
std::lock_guard<std::mutex> lock(SmallStack::GetPool().GetMutex());
PooledSmallStack &popped = SmallStack::GetPool().Get(this->next); PooledSmallStack &popped = SmallStack::GetPool().Get(this->next);
this->value = popped.value; this->value = popped.value;
if (popped.branch_count == 0) { if (popped.branch_count == 0) {