From: Tom Tromey via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH 13/14] Fix "source" with interpreter-exec
Date: Fri, 12 Aug 2022 18:54:41 -0600 [thread overview]
Message-ID: <20220813005442.4163512-14-tromey@adacore.com> (raw)
In-Reply-To: <20220813005442.4163512-1-tromey@adacore.com>
PR mi/15811 points out that "source"ing a file that uses
interpreter-exec will put gdb in a weird state, where the CLI stops
working. The bug is that tui_interp::suspend does not unregister the
event file descriptor.
The test case is from Andrew Burgess.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=15811
---
gdb/testsuite/gdb.base/interpreter-exec.gdb | 20 ++++++++++++++++++++
gdb/testsuite/gdb.base/source.exp | 6 ++++++
gdb/tui/tui-interp.c | 1 +
3 files changed, 27 insertions(+)
create mode 100644 gdb/testsuite/gdb.base/interpreter-exec.gdb
diff --git a/gdb/testsuite/gdb.base/interpreter-exec.gdb b/gdb/testsuite/gdb.base/interpreter-exec.gdb
new file mode 100644
index 00000000000..6afff23af0f
--- /dev/null
+++ b/gdb/testsuite/gdb.base/interpreter-exec.gdb
@@ -0,0 +1,20 @@
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test GDB's "source" command for scripts containing interpreter-exec.
+
+interpreter-exec mi "-gdb-show verbose"
diff --git a/gdb/testsuite/gdb.base/source.exp b/gdb/testsuite/gdb.base/source.exp
index 3d72b504832..9884a720420 100644
--- a/gdb/testsuite/gdb.base/source.exp
+++ b/gdb/testsuite/gdb.base/source.exp
@@ -73,3 +73,9 @@ gdb_test "source ${srcdir}/${subdir}/source-error.gdb" \
"source-error-1.gdb:21: Error in sourced command file:" \
"Cannot access memory at address 0x0" ] \
"script contains error"
+
+# There was a case where sourcing a script containing "interpreter-exec"
+# commands would corrupt the interpreter mechanism and crash gdb.
+gdb_test "source ${srcdir}/${subdir}/interpreter-exec.gdb" \
+ "\\^done,value=\"off\"" \
+ "source interpreter-exec"
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index 1c4ffbbc3aa..e0846fe80c4 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -135,6 +135,7 @@ tui_interp::resume ()
void
tui_interp::suspend ()
{
+ gdb_disable_readline ();
tui_start_enabled = tui_active;
tui_disable ();
}
--
2.34.1
next prev parent reply other threads:[~2022-08-13 0:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-13 0:54 [PATCH 00/14] Minor ui / interp cleanups Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 01/14] Remove some dead code Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 02/14] Free ui::line_buffer Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 03/14] Use ui_out_redirect_pop in more places Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 04/14] Remove the "for moment" comments Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 05/14] Remove obsolete filtering comment Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 06/14] Remove two unused members from mi_interp Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 07/14] Use member initialization in 'struct ui' Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 08/14] Use scoped_restore in safe_parse_type Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 09/14] Remove tui_out_new Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 10/14] Remove a ui-related memory leak Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 11/14] TUI stdout buffering cleanup Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 12/14] Remove a call to clear_interpreter_hooks Tom Tromey via Gdb-patches
2022-08-13 0:54 ` Tom Tromey via Gdb-patches [this message]
2022-08-13 1:58 ` [PATCH 13/14] Fix "source" with interpreter-exec Enze Li via Gdb-patches
2022-08-15 17:28 ` Tom Tromey via Gdb-patches
2022-08-13 0:54 ` [PATCH 14/14] Fix interpreter-exec crash Tom Tromey via Gdb-patches
2022-08-31 17:13 ` [PATCH 00/14] Minor ui / interp cleanups Tom Tromey
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=20220813005442.4163512-14-tromey@adacore.com \
--to=gdb-patches@sourceware.org \
--cc=tromey@adacore.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