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

Merge pull request #38322 from RandomShaper/imvu/fix_not_freed_gdsfuncstate_3.2

Browse Source 
Fix leaked objects when game ends with yields in progress (3.2)
This commit is contained in:
Rémi Verschelde 2020-04-29 17:30:39 +02:00 committed by GitHub
commit c8ea779848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/gdscript/gdscript_function.cpp
View File

@ -292,7 +292,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
line = p_state->line; line = p_state->line;
ip = p_state->ip; ip = p_state->ip;
alloca_size = p_state->stack.size(); alloca_size = p_state->stack.size();
script = p_state->script.ptr(); script = p_state->script;
p_instance = p_state->instance; p_instance = p_state->instance;
defarg = p_state->defarg; defarg = p_state->defarg;
self = p_state->self; self = p_state->self;
@ -1271,13 +1271,17 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
gdfs->state.stack_size = _stack_size; gdfs->state.stack_size = _stack_size;
gdfs->state.self = self; gdfs->state.self = self;
gdfs->state.alloca_size = alloca_size; gdfs->state.alloca_size = alloca_size;
gdfs->state.script = Ref<GDScript>(_script);
gdfs->state.ip = ip + ipofs; gdfs->state.ip = ip + ipofs;
gdfs->state.line = line; gdfs->state.line = line;
gdfs->state.script = _script;
gdfs->state.script_id = _script->get_instance_id();
#ifdef DEBUG_ENABLED
gdfs->state.script_path = _script->get_path();
#endif
gdfs->state.instance = p_instance;
gdfs->state.instance_id = (p_instance && p_instance->get_owner()) ? p_instance->get_owner()->get_instance_id() : 0; gdfs->state.instance_id = (p_instance && p_instance->get_owner()) ? p_instance->get_owner()->get_instance_id() : 0;
//gdfs->state.result_pos=ip+ipofs-1; //gdfs->state.result_pos=ip+ipofs-1;
gdfs->state.defarg = defarg; gdfs->state.defarg = defarg;
gdfs->state.instance = p_instance;
gdfs->function = this; gdfs->function = this;
retvalue = gdfs; retvalue = gdfs;
@ -1828,9 +1832,17 @@ bool GDScriptFunctionState::is_valid(bool p_extended_check) const {
return false; return false;
if (p_extended_check) { if (p_extended_check) {
//class instance gone? if (state.instance_id) {
if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) // Class instance gone? (Otherwise script is valid for sure, because the instance has a ref to the script)
return false; if (!ObjectDB::get_instance(state.instance_id)) {
return false;
}
} else {
// Script gone? (Static method, so there's no instance whose ref to the script can ensure it's valid)
if (!ObjectDB::get_instance(state.script_id)) {
return false;
}
}
} }
return true; return true;
@ -1839,12 +1851,22 @@ bool GDScriptFunctionState::is_valid(bool p_extended_check) const {
Variant GDScriptFunctionState::resume(const Variant &p_arg) { Variant GDScriptFunctionState::resume(const Variant &p_arg) {
ERR_FAIL_COND_V(!function, Variant()); ERR_FAIL_COND_V(!function, Variant());
if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) { if (state.instance_id) {
if (!ObjectDB::get_instance(state.instance_id)) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
ERR_FAIL_V_MSG(Variant(), "Resumed function '" + String(function->get_name()) + "()' after yield, but class instance is gone. At script: " + state.script->get_path() + ":" + itos(state.line)); ERR_FAIL_V_MSG(Variant(), "Resumed function '" + String(function->get_name()) + "()' after yield, but class instance is gone. At script: " + state.script_path + ":" + itos(state.line));
#else #else
return Variant(); return Variant();
#endif #endif
}
} else {
if (!ObjectDB::get_instance(state.script_id)) {
#ifdef DEBUG_ENABLED
ERR_FAIL_V_MSG(Variant(), "Resumed function '" + String(function->get_name()) + "()' after yield, but script is gone. At script: " + state.script_path + ":" + itos(state.line));
#else
return Variant();
#endif
}
} }
state.result = p_arg; state.result = p_arg;

8
modules/gdscript/gdscript_function.h
View File

@ -293,13 +293,17 @@ private:
public: public:
struct CallState { struct CallState {
ObjectID instance_id; GDScript *script;
ObjectID script_id;
#ifdef DEBUG_ENABLED
String script_path;
#endif
GDScriptInstance *instance; GDScriptInstance *instance;
ObjectID instance_id;
Vector<uint8_t> stack; Vector<uint8_t> stack;
int stack_size; int stack_size;
Variant self; Variant self;
uint32_t alloca_size; uint32_t alloca_size;
Ref<GDScript> script;
int ip; int ip;
int line; int line;
int defarg; int defarg;