godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ~CSharpScript() holding on to a mutex longer than necessary, creating potential for a deadlock.

Browse Source 
(cherry picked from commit 9d50a486bf)
This commit is contained in:
Michael Wörner 2024-01-28 11:46:38 +01:00 committed by Rémi Verschelde
parent 587d689c5f
commit 167b4c071c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/csharp_script.cpp
View File

@ -2819,15 +2819,17 @@ CSharpScript::CSharpScript() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
{ {
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex); MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
CSharpLanguage::get_singleton()->script_list.add(&this->script_list); CSharpLanguage::get_singleton()->script_list.add(&script_list);
} }
#endif #endif
} }
CSharpScript::~CSharpScript() { CSharpScript::~CSharpScript() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex); {
CSharpLanguage::get_singleton()->script_list.remove(&this->script_list); MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
CSharpLanguage::get_singleton()->script_list.remove(&script_list);
}
#endif #endif
if (GDMonoCache::godot_api_cache_updated) { if (GDMonoCache::godot_api_cache_updated) {