Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #105538 from clayjohn/rid_owner-validation

Browse source 
Remove 2^31 cap on RID allocations
This commit is contained in:
Thaddeus Crews 2025-04-21 08:24:21 -05:00
commit 6c35474568
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/templates/rid_owner.h
View file

@ -164,8 +164,7 @@ class RID_Alloc : public RID_AllocBase {
uint32_t free_chunk = free_index / elements_in_chunk;
uint32_t free_element = free_index % elements_in_chunk;
uint32_t validator = (uint32_t)(_gen_id() & 0x7FFFFFFF);
CRASH_COND_MSG(validator == 0x7FFFFFFF, "Overflow in RID validator");
uint32_t validator = 1 + (uint32_t)(_gen_id() % 0x7FFFFFFF);
uint64_t id = validator;
id <<= 32;
id |= free_index;
@ -329,7 +328,7 @@ public:
uint32_t validator = uint32_t(id >> 32);
bool owned = (validator != 0x7FFFFFFF) && (chunks[idx_chunk][idx_element].validator & 0x7FFFFFFF) == validator;
bool owned = (chunks[idx_chunk][idx_element].validator & 0x7FFFFFFF) == validator;
if constexpr (THREAD_SAFE) {
mutex.unlock();