From patchwork Wed Sep 14 22:59:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 15648 Received: (qmail 80029 invoked by alias); 14 Sep 2016 22:59:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 79951 invoked by uid 89); 14 Sep 2016 22:59:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=2016-09-11, H*Ad:U*tom, H*m:tom, sk:arnez@l X-HELO: gproxy4-pub.mail.unifiedlayer.com Received: from gproxy4-pub.mail.unifiedlayer.com (HELO gproxy4-pub.mail.unifiedlayer.com) (69.89.23.142) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Wed, 14 Sep 2016 22:59:42 +0000 Received: (qmail 19857 invoked by uid 0); 14 Sep 2016 22:59:39 -0000 Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy4.mail.unifiedlayer.com with SMTP; 14 Sep 2016 22:59:39 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id jazZ1t00W2f2jeq01azcnn; Wed, 14 Sep 2016 16:59:39 -0600 X-Authority-Analysis: v=2.1 cv=IqWNLtPg c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=PnD2wP_eR3oA:10 a=Cq4ZOyQJfnsA:10 a=GW1xBdLrtEIA:10 a=zstS-IiYAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=mDV3o1hIAAAA:8 a=N1bG4fbQ6ZG_rhqqWJkA:9 a=4G6NA9xxw8l3yy4pmD5M:22 a=skCgnbhlp52w9zbo2JeP:22 a=e_O65bzb51kRm2y5VmPK:22 a=_FVE-zBwftR9WsbkzFJk:22 Received: from 174-16-151-161.hlrn.qwest.net ([174.16.151.161]:54940 helo=localhost.localdomain) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_2) (envelope-from ) id 1bkJ9R-0003PC-DP; Wed, 14 Sep 2016 16:59:33 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 1/2] PR gdb/20604 - fix "quit" when an invalid expression is used Date: Wed, 14 Sep 2016 16:59:21 -0600 Message-Id: <1473893962-12420-1-git-send-email-tom@tromey.com> X-Identified-User: {36111:box522.bluehost.com:elynrobi:tromey.com} {sentby:smtp auth 174.16.151.161 authed with tom+tromey.com} X-Exim-ID: 1bkJ9R-0003PC-DP X-Source-Sender: 174-16-151-161.hlrn.qwest.net (localhost.localdomain) [174.16.151.161]:54940 X-Source-Auth: tom+tromey.com X-Email-Count: 0 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This fixes PR gdb/20604. The bug here is that passing an invalid expression to "quit" -- e.g., "quit()" -- causes gdb to enter a non-functioning state. The immediate problem is that quit_force resets the terminal before evaluating the expression. However, it seemed to me that it doesn't really make sense to pass the quit_force argument to kill_or_detach (which passes it to to_detach), first because conflating the exit status for "quit" and the signal to pass when detaching doesn't make sense, and second because to_detach implementations generally only accept a constant here, while "quit" accepts an expression. So, I removed that. As an aside, I think the "detach SIGNO" functionality is not documented. Built and regtested on x86-64 Fedora 24. 2016-09-13 Tom Tromey PR gdb/20604: * top.h (quit_force): Update. * top.c (quit_force): Changed type of first argument. Don't evaluate expression. Pass NULL to kill_or_detach. * cli/cli-cmds.c (quit_command): Evaluate "args". 2016-09-13 Tom Tromey PR gdb/20604: * gdb.base/quit.exp: New file. --- gdb/ChangeLog | 8 ++++++++ gdb/cli/cli-cmds.c | 13 ++++++++++++- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/quit.exp | 34 ++++++++++++++++++++++++++++++++++ gdb/top.c | 12 ++++-------- gdb/top.h | 2 +- 6 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 gdb/testsuite/gdb.base/quit.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b585914..8f8d554 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2016-09-13 Tom Tromey + + PR gdb/20604: + * top.h (quit_force): Update. + * top.c (quit_force): Changed type of first argument. Don't + evaluate expression. Pass NULL to kill_or_detach. + * cli/cli-cmds.c (quit_command): Evaluate "args". + 2016-09-09 Andreas Arnez * elfread.c (auxv.h): New include. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index c60b1d3..6495477 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -343,12 +343,23 @@ show_configuration (char *args, int from_tty) void quit_command (char *args, int from_tty) { + int exit_code = 0; + + /* An optional expression may be used to cause gdb to terminate with + the value of that expression. */ + if (args) + { + struct value *val = parse_and_eval (args); + + exit_code = (int) value_as_long (val); + } + if (!quit_confirm ()) error (_("Not confirmed.")); query_if_trace_running (from_tty); - quit_force (args, from_tty); + quit_force (args ? &exit_code : NULL, from_tty); } static void diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c63ea72..e34ae67 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-13 Tom Tromey + + PR gdb/20604: + * gdb.base/quit.exp: New file. + 2016-09-11 Sergio Durigan Junior Jan Kratochvil diff --git a/gdb/testsuite/gdb.base/quit.exp b/gdb/testsuite/gdb.base/quit.exp new file mode 100644 index 0000000..c0f5f57 --- /dev/null +++ b/gdb/testsuite/gdb.base/quit.exp @@ -0,0 +1,34 @@ +# Copyright (C) 2016 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 . + +# Check the "quit" command. + +clean_restart + +# Test that a syntax error causes quit to abort. +# Regression test for PR gdb/20604. +gdb_test "quit()" "A syntax error in expression, near .*" \ + "quit with syntax error" + +# Test that an expression can be used to set the error code. +send_gdb "quit 22+1\n" +set result [wait -i $gdb_spawn_id] +verbose $result +if {[lindex $result 2] == 0 && [lindex $result 3] == 23} { + pass "quit with expression" +} else { + fail "quit with expression" +} +close $gdb_spawn_id diff --git a/gdb/top.c b/gdb/top.c index 320c296..3cfa113 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1625,7 +1625,7 @@ undo_terminal_modifications_before_exit (void) /* Quit without asking for confirmation. */ void -quit_force (char *args, int from_tty) +quit_force (int *exit_arg, int from_tty) { int exit_code = 0; struct qt_args qt; @@ -1634,16 +1634,12 @@ quit_force (char *args, int from_tty) /* An optional expression may be used to cause gdb to terminate with the value of that expression. */ - if (args) - { - struct value *val = parse_and_eval (args); - - exit_code = (int) value_as_long (val); - } + if (exit_arg) + exit_code = *exit_arg; else if (return_child_result) exit_code = return_child_result_value; - qt.args = args; + qt.args = NULL; qt.from_tty = from_tty; /* We want to handle any quit errors and exit regardless. */ diff --git a/gdb/top.h b/gdb/top.h index ee664c1..acdb8e9 100644 --- a/gdb/top.h +++ b/gdb/top.h @@ -212,7 +212,7 @@ extern void read_command_file (FILE *); extern void init_history (void); extern void command_loop (void); extern int quit_confirm (void); -extern void quit_force (char *, int); +extern void quit_force (int *, int); extern void quit_command (char *, int); extern void quit_cover (void); extern void execute_command (char *, int);