소스 검색

Add mutex to protect script bindings

Matthew A. Robinson 4 년 전
부모
커밋
be4671534c
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(unmanaged->has_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index()));
 
-		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
 		unmanaged->set_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index(), data);