godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #35527 from neikeq/issue-35259

Browse Source 
Mono/C#: Fix _update_exports possible crash with Reference types
This commit is contained in:
Rémi Verschelde
2020-01-24 21:51:57 +01:00
committed by GitHub
parent 75ab07546b 966a126186
commit c96f08dc86
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mono/csharp_script.cpp
View File

@@ -2425,6 +2425,9 @@ bool CSharpScript::_update_exports() {
top = top->get_parent_class(); top = top->get_parent_class();
} }
// Need to check this here, before disposal
bool base_ref = Object::cast_to<Reference>(tmp_native) != NULL;
// Dispose the temporary managed instance // Dispose the temporary managed instance
MonoException *exc = NULL; MonoException *exc = NULL;
@@ -2438,7 +2441,7 @@ bool CSharpScript::_update_exports() {
MonoGCHandle::free_handle(tmp_pinned_gchandle); MonoGCHandle::free_handle(tmp_pinned_gchandle);
tmp_object = NULL; tmp_object = NULL;
if (tmp_native && !Object::cast_to<Reference>(tmp_native)) { if (tmp_native && !base_ref) {
Node *node = Object::cast_to<Node>(tmp_native); Node *node = Object::cast_to<Node>(tmp_native);
if (node && node->is_inside_tree()) { if (node && node->is_inside_tree()) {
ERR_PRINTS("Temporary instance was added to the scene tree."); ERR_PRINTS("Temporary instance was added to the scene tree.");