public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix "source" with interpreter-exec Date: Wed, 31 Aug 2022 17:15:11 +0000 (GMT) [thread overview] Message-ID: <20220831171511.03D293858D39@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1e28eebbbc34ebec69ea4913f7e8d19352e35630 commit 1e28eebbbc34ebec69ea4913f7e8d19352e35630 Author: Tom Tromey <tromey@adacore.com> Date: Fri Aug 12 13:50:35 2022 -0600 Fix "source" with interpreter-exec 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 Diff: --- 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(+) diff --git a/gdb/testsuite/gdb.base/interpreter-exec.gdb b/gdb/testsuite/gdb.base/interpreter-exec.gdb new file mode 100644 index 00000000000..434a4adb9ce --- /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-2022 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 (); }
reply other threads:[~2022-08-31 17:15 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=20220831171511.03D293858D39@sourceware.org \ --to=tromey@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /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: linkBe 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).