Merge pull request #74759 from AThousandShips/rid_overflow

Handle RID validator overflow
godotengine · Jun 20, 2023 · 7dc69ff · 7dc69ff
2 parents dbe8712 + e344bab
commit 7dc69ff
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h
@@ -117,6 +117,7 @@ class RID_Alloc : public RID_AllocBase {
 		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");
 		uint64_t id = validator;
 		id <<= 32;
 		id |= free_index;
@@ -238,7 +239,7 @@ class RID_Alloc : public RID_AllocBase {
 
 		uint32_t validator = uint32_t(id >> 32);
 
-		bool owned = (validator_chunks[idx_chunk][idx_element] & 0x7FFFFFFF) == validator;
+		bool owned = (validator != 0x7FFFFFFF) && (validator_chunks[idx_chunk][idx_element] & 0x7FFFFFFF) == validator;
 
 		if (THREAD_SAFE) {
 			spin_lock.unlock();