aboutsummaryrefslogtreecommitdiff
path: root/gdb/guile
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2021-10-09 18:58:30 +0200
committerTom de Vries <tdevries@suse.de>2021-10-09 18:58:30 +0200
commit84a6adfd4c7bc9e99a270b8a111da7218a0e89a5 (patch)
tree2c9335466ee4a93d7d2b907a4e6f3f1a8fecd2af /gdb/guile
parentfa9ce2c143ce7ee6bc4f22a0577fe5c0858beddd (diff)
downloadgdb-84a6adfd4c7bc9e99a270b8a111da7218a0e89a5.zip
gdb-84a6adfd4c7bc9e99a270b8a111da7218a0e89a5.tar.gz
gdb-84a6adfd4c7bc9e99a270b8a111da7218a0e89a5.tar.bz2
[gdb] Make execute_command_to_string return string on throw
The pattern for using execute_command_to_string is: ... std::string output; output = execute_fn_to_string (fn, term_out); ... This results in a problem when using it in a try/catch: ... try { output = execute_fn_to_string (fn, term_out) } catch (const gdb_exception &e) { /* Use output. */ } ... If an expection was thrown during execute_fn_to_string, then the output remains unassigned, while it could be worthwhile to known what output was generated by gdb before the expection was thrown. Fix this by returning the string using a parameter instead: ... execute_fn_to_string (output, fn, term_out) ... Also add a variant without string parameter, to support places where the function is used while ignoring the result: ... execute_fn_to_string (fn, term_out) ... Tested on x86_64-linux.
Diffstat (limited to 'gdb/guile')
-rw-r--r--gdb/guile/guile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index a28dee3..8ba840c 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -302,7 +302,7 @@ gdbscm_execute_gdb_command (SCM command_scm, SCM rest)
scoped_restore preventer = prevent_dont_repeat ();
if (to_string)
- to_string_res = execute_command_to_string (command, from_tty, false);
+ execute_command_to_string (to_string_res, command, from_tty, false);
else
execute_command (command, from_tty);