godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

GDScript: Fix stack overflow when using multiple await

Browse Source
This commit is contained in:
George Marques
2022-05-27 09:13:25 -03:00
parent 8a21f7231f
commit 328aadc0ef
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_function.cpp
View File

@@ -270,6 +270,8 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
if (EngineDebugger::is_active()) { if (EngineDebugger::is_active()) {
GDScriptLanguage::get_singleton()->exit_function(); GDScriptLanguage::get_singleton()->exit_function();
} }
_clear_stack();
#endif #endif
} }

21
modules/gdscript/gdscript_vm.cpp
View File

@@ -3450,24 +3450,27 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
GDScriptLanguage::get_singleton()->script_frame_time += time_taken - function_call_time; GDScriptLanguage::get_singleton()->script_frame_time += time_taken - function_call_time;
} }
// Check if this function has been interrupted by `await`. // Check if this is not the last time it was interrupted by `await` or if it's the first time executing.
// If that is the case we want to keep it in the debugger until it actually exits. // If that is the case then we exit the function as normal. Otherwise we postpone it until the last `await` is completed.
// This ensures the call stack can be properly shown when using `await`, showing what resumed the function. // This ensures the call stack can be properly shown when using `await`, showing what resumed the function.
if (!awaited) { if (!p_state || awaited) {
if (EngineDebugger::is_active()) { if (EngineDebugger::is_active()) {
GDScriptLanguage::get_singleton()->exit_function(); GDScriptLanguage::get_singleton()->exit_function();
} }
#endif
// Free stack, except reserved addresses.
for (int i = 3; i < _stack_size; i++) {
stack[i].~Variant();
}
#ifdef DEBUG_ENABLED
} }
#endif #endif
// Clear the stack even if there was an `await`. // Always free reserved addresses, since they are never copied.
// The stack saved in the state is a copy, so this needs to be destructed to avoid leaks. for (int i = 0; i < 3; i++) {
if (_stack_size) {
// Free stack.
for (int i = 0; i < _stack_size; i++) {
stack[i].~Variant(); stack[i].~Variant();
} }
}
return retvalue; return retvalue;
} }