Преглед на файлове

Merge pull request #47295 from omegachysis/script-bind-mutex

Fix race condition on `script_binding` in C#
Ignacio Roldán Etcheverry преди 4 години
родител
ревизия
e95fa21b45
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      modules/mono/mono_gd/gd_mono_internals.cpp

+ 5 - 1
modules/mono/mono_gd/gd_mono_internals.cpp

@@ -91,7 +91,11 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {
 		// The object was just created, no script instance binding should have been attached
 		CRASH_COND(CSharpLanguage::has_instance_binding(unmanaged));
 
-		void *data = (void *)CSharpLanguage::get_singleton()->insert_script_binding(unmanaged, script_binding);
+		void *data;
+		{
+			MutexLock lock(CSharpLanguage::get_singleton()->get_language_bind_mutex());
+			data = (void *)CSharpLanguage::get_singleton()->insert_script_binding(unmanaged, script_binding);
+		}
 
 		// Should be thread safe because the object was just created and nothing else should be referencing it
 		CSharpLanguage::set_instance_binding(unmanaged, data);