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

Fix infinite loop on EOF in the command line debugger 

When using the command line debugger (godot -d) on Unix systems, when
entering an EOF (ctrl+D), the debugger enters an infinite loop.

Adding a check for EOF in the debugger loop exits the debugger when EOF
is entered.

Fixes #50170.

(cherry picked from commit 4ecad8dea3)
(cherry picked from commit d1dcea79d4)
This commit is contained in:
Simon Barkehanai 2023-06-11 04:20:22 -07:00 committed by Rémi Verschelde
parent e0ad1e8358
commit bf2d62382f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/script_debugger_local.cpp
View File

@ -56,7 +56,7 @@ void ScriptDebuggerLocal::debug(ScriptLanguage *p_script, bool p_can_continue, b
// Cache options // Cache options
String variable_prefix = options["variable_prefix"]; String variable_prefix = options["variable_prefix"];
if (line == "") { if (line.empty() && !feof(stdin)) {
print_line("\nDebugger Break, Reason: '" + p_script->debug_get_error() + "'"); print_line("\nDebugger Break, Reason: '" + p_script->debug_get_error() + "'");
print_line("*Frame " + itos(current_frame) + " - " + p_script->debug_get_stack_level_source(current_frame) + ":" + itos(p_script->debug_get_stack_level_line(current_frame)) + " in function '" + p_script->debug_get_stack_level_function(current_frame) + "'"); print_line("*Frame " + itos(current_frame) + " - " + p_script->debug_get_stack_level_source(current_frame) + ":" + itos(p_script->debug_get_stack_level_line(current_frame)) + " in function '" + p_script->debug_get_stack_level_function(current_frame) + "'");
print_line("Enter \"help\" for assistance."); print_line("Enter \"help\" for assistance.");
@ -185,7 +185,7 @@ void ScriptDebuggerLocal::debug(ScriptLanguage *p_script, bool p_can_continue, b
print_line("Added breakpoint at " + source + ":" + itos(linenr)); print_line("Added breakpoint at " + source + ":" + itos(linenr));
} }
} else if (line == "q" || line == "quit") { } else if (line == "q" || line == "quit" || (line.empty() && feof(stdin))) {
// Do not stop again on quit // Do not stop again on quit
clear_breakpoints(); clear_breakpoints();
ScriptDebugger::get_singleton()->set_depth(-1); ScriptDebugger::get_singleton()->set_depth(-1);