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

Merge pull request #42356 from RandomShaper/fix_gdscript_inf_loop

Browse Source 
Avoid infinite loop in GDScript at shutdown
This commit is contained in:
Rémi Verschelde 2020-09-26 23:20:31 +02:00 committed by GitHub
commit bfd5b58223
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gdscript/gdscript.cpp
View File

@ -2039,8 +2039,15 @@ GDScriptLanguage::~GDScriptLanguage() {
} }
// Clear dependencies between scripts, to ensure cyclic references are broken (to avoid leaks at exit). // Clear dependencies between scripts, to ensure cyclic references are broken (to avoid leaks at exit).
while (script_list.first()) { SelfList<GDScript> *s = script_list.first();
GDScript *script = script_list.first()->self(); while (s) {
GDScript *script = s->self();
// This ensures the current script is not released before we can check what's the next one
// in the list (we can't get the next upfront because we don't know if the reference breaking
// will cause it -or any other after it, for that matter- to be released so the next one
// is not the same as before).
script->reference();
for (Map<StringName, GDScriptFunction *>::Element *E = script->member_functions.front(); E; E = E->next()) { for (Map<StringName, GDScriptFunction *>::Element *E = script->member_functions.front(); E; E = E->next()) {
GDScriptFunction *func = E->get(); GDScriptFunction *func = E->get();
for (int i = 0; i < func->argument_types.size(); i++) { for (int i = 0; i < func->argument_types.size(); i++) {
@ -2051,6 +2058,9 @@ GDScriptLanguage::~GDScriptLanguage() {
for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) { for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) {
E->get().data_type.script_type_ref = Ref<Script>(); E->get().data_type.script_type_ref = Ref<Script>();
} }
s = s->next();
script->unreference();
} }
singleton = NULL; singleton = NULL;