From: Jan Vrany <jan.vrany@labware.com>
To: gdb-patches@sourceware.org
Cc: Jan Vrany <jan.vrany@labware.com>,
Simon Marchi <simon.marchi@efficios.com>
Subject: [pushed] gdb: fix command lookup in execute_command ()
Date: Mon, 19 Dec 2022 11:47:45 +0000 [thread overview]
Message-ID: <20221219114745.455799-1-jan.vrany@labware.com> (raw)
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>
---
gdb/top.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/gdb/top.c b/gdb/top.c
index 45e65beb3b3..b732f29653f 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -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. */
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,
a command may redefine itself. In this case, C pointer
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)
execute_cmd_post_hook (c);
--
2.35.1
reply other threads:[~2022-12-19 11:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221219114745.455799-1-jan.vrany@labware.com \
--to=jan.vrany@labware.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).