From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 03D293858D39; Wed, 31 Aug 2022 17:15:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03D293858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661966111; bh=XVsG8oJfUnuEP1IlEPUQiPdVQW/GZIM5zHWcgui4wck=; h=From:To:Subject:Date:From; b=N3qlj6Y2+PLX2KMGfIcG0bNQ0QTPOiE9jAa0jjPJJzVhKWAxPvCb1/qSAPNYOxTqK R1/cLZmtX4SiGX6RStwJO9Q+0bV4GrjDGFitMRfH06wip1i4N8Oa7Gl9ZRVwn6Q5ZV FxUqFkClnMzp+PCEy1mwCbH6BXSYLFvqdlRUDYfc= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix "source" with interpreter-exec X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 610f8c63394782fa73b12ff67f6cd2b76180ad2c X-Git-Newrev: 1e28eebbbc34ebec69ea4913f7e8d19352e35630 Message-Id: <20220831171511.03D293858D39@sourceware.org> Date: Wed, 31 Aug 2022 17:15:11 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1e28eebbbc34= ebec69ea4913f7e8d19352e35630 commit 1e28eebbbc34ebec69ea4913f7e8d19352e35630 Author: Tom Tromey Date: Fri Aug 12 13:50:35 2022 -0600 Fix "source" with interpreter-exec =20 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. =20 The test case is from Andrew Burgess. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D15811 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/gd= b.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 . + +# 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/sou= rce.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=3D\"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 =3D tui_active; tui_disable (); }