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

gdb: fix command lookup in execute_command ()

Browse source 
Commit b5661ff2 ("gdb: fix possible use-after-free when
executing commands") used lookup_cmd_exact () to lookup
command again after its execution to avoid possible
use-after-free error.

However this change broke test gdb.base/define.exp which
defines a post-hook for subcommand ("target testsuite").
In this case,  lookup_cmd_exact () returned NULL because
there's no command 'testsuite' in top-level commands.

This commit fixes this case by looking up the command again
using the original command line via lookup_cmd ().

Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
Jan Vrany 2022-12-19 11:24:36 +00:00
parent 42f39fdedc
commit 37e5833da5
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/top.c
View file

@ -651,11 +651,6 @@ execute_command (const char *p, int from_tty)
} }
} }
/* Remember name of the command. This is needed later when
executing command post-hooks to handle the case when command
is redefined or removed during it's execution. See below. */
std::string c_name (c->name);
/* If this command has been pre-hooked, run the hook first. */ /* If this command has been pre-hooked, run the hook first. */
execute_cmd_pre_hook (c); execute_cmd_pre_hook (c);
@ -698,7 +693,8 @@ execute_command (const char *p, int from_tty)
We need to lookup the command again since during its execution, We need to lookup the command again since during its execution,
a command may redefine itself. In this case, C pointer a command may redefine itself. In this case, C pointer
becomes invalid so we need to look it up again. */ becomes invalid so we need to look it up again. */
c = lookup_cmd_exact (c_name.c_str (), cmdlist); const char *cmd2 = cmd_start;
c = lookup_cmd (&cmd2, cmdlist, "", nullptr, 1, 1);
if (c != nullptr) if (c != nullptr)
execute_cmd_post_hook (c); execute_cmd_post_hook (c);