diff options
| author | Tom de Vries <tdevries@suse.de> | 2021-10-09 18:58:30 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2021-10-09 18:58:30 +0200 |
| commit | 84a6adfd4c7bc9e99a270b8a111da7218a0e89a5 (patch) | |
| tree | 2c9335466ee4a93d7d2b907a4e6f3f1a8fecd2af /gdb/complaints.c | |
| parent | fa9ce2c143ce7ee6bc4f22a0577fe5c0858beddd (diff) | |
| download | gdb-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/complaints.c')
| -rw-r--r-- | gdb/complaints.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/complaints.c b/gdb/complaints.c index 525a3a7..a823fcb 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -91,7 +91,7 @@ test_complaints () do \ { \ std::string output; \ - output = execute_fn_to_string ([]() { complaint (STR); }, false); \ + execute_fn_to_string (output, []() { complaint (STR); }, false); \ std::string expected \ = _("During symbol reading: ") + std::string (STR "\n"); \ SELF_CHECK (output == expected); \ @@ -102,7 +102,7 @@ test_complaints () do \ { \ std::string output; \ - output = execute_fn_to_string ([]() { complaint (STR); }, false); \ + execute_fn_to_string (output, []() { complaint (STR); }, false); \ SELF_CHECK (output.empty ()); \ SELF_CHECK (counters[STR] == CNT); \ } while (0) |