godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #22537 from Zylann/fix_objectid_leak_thread 

Fix dirty read of ObjectID counter when threads are involved
This commit is contained in:
Rémi Verschelde 2018-09-30 22:28:41 +02:00 committed by GitHub
parent c459fad43c a392d553c2
commit 36e02a0fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/object.cpp
View File

@ -2014,11 +2014,13 @@ ObjectID ObjectDB::add_instance(Object *p_object) {
ERR_FAIL_COND_V(p_object->get_instance_id() != 0, 0); ERR_FAIL_COND_V(p_object->get_instance_id() != 0, 0);
rw_lock->write_lock(); rw_lock->write_lock();
instances[++instance_counter] = p_object; ObjectID instance_id = ++instance_counter;
instance_checks[p_object] = instance_counter; instances[instance_id] = p_object;
instance_checks[p_object] = instance_id;
rw_lock->write_unlock(); rw_lock->write_unlock();
return instance_counter; return instance_id;
} }
void ObjectDB::remove_instance(Object *p_object) { void ObjectDB::remove_instance(Object *p_object) {
@ -2095,6 +2097,5 @@ void ObjectDB::cleanup() {
instances.clear(); instances.clear();
instance_checks.clear(); instance_checks.clear();
rw_lock->write_unlock(); rw_lock->write_unlock();
memdelete(rw_lock); memdelete(rw_lock);
} }