FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gdb] Make execute_command_to_string return string on throw

Browse source 
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.
This commit is contained in:
Tom de Vries 2021-10-09 18:58:30 +02:00
parent fa9ce2c143
commit 84a6adfd4c
7 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/python/python.c
View file

@ -1924,11 +1924,11 @@ namespace selftests {
static void
test_python ()
{
#define CMD execute_command_to_string ("python print(5)", 0, true);
#define CMD(S) execute_command_to_string (S, "python print(5)", 0, true)
std::string output;
output = CMD;
CMD (output);
SELF_CHECK (output == "5\n");
output.clear ();
@ -1937,7 +1937,7 @@ test_python ()
= make_scoped_restore (&gdb_python_initialized, 0);
try
{
output = CMD;
CMD (output);
}
catch (const gdb_exception &e)
{