maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats 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();
}
// Need to check this here, before disposal
bool base_ref = Object::cast_to<Reference>(tmp_native) != NULL;
// Dispose the temporary managed instance
MonoException *exc = NULL;
@ -2438,7 +2441,7 @@ bool CSharpScript::_update_exports() {
MonoGCHandle::free_handle(tmp_pinned_gchandle);
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);
if (node && node->is_inside_tree()) {
ERR_PRINTS("Temporary instance was added to the scene tree.");