diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/target.c | 10 | ||||
| -rw-r--r-- | gdb/target.h | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/warning.exp | 36 |
5 files changed, 59 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index be1b3d8..3a4db38 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2018-11-08 Tom Tromey <tom@tromey.com> + + PR gdb/23555: + PR gdb/23838: + * target.h (target_supports_terminal_ours): Return bool. + * target.c (target_supports_terminal_ours): Handle case where + current_top_target returns nullptr. Return bool. + 2018-11-08 Joel Brobecker <brobecker@adacore.com> * aarch64-tdep.c (aapcs_is_vfp_call_or_return_candidate_1): diff --git a/gdb/target.c b/gdb/target.c index 2d98954..9404025 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -584,10 +584,16 @@ target_terminal::info (const char *arg, int from_tty) /* See target.h. */ -int +bool target_supports_terminal_ours (void) { - return current_top_target ()->supports_terminal_ours (); + /* This can be called before there is any target, so we must check + for nullptr here. */ + target_ops *top = current_top_target (); + + if (top == nullptr) + return false; + return top->supports_terminal_ours (); } static void diff --git a/gdb/target.h b/gdb/target.h index a3000c8..6f4b73b 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1577,7 +1577,7 @@ extern int target_remove_breakpoint (struct gdbarch *gdbarch, /* Return true if the target stack has a non-default "terminal_ours" method. */ -extern int target_supports_terminal_ours (void); +extern bool target_supports_terminal_ours (void); /* Kill the inferior process. Make it go away. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e0bb838..a0e614f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-11-08 Tom Tromey <tom@tromey.com> + + PR gdb/23555: + PR gdb/23838: + * gdb.base/warning.exp: New file. + 2018-11-08 Jan Beulich <jbeulich@suse.com> * testsuite/gdb.arch/i386-avx512.c, diff --git a/gdb/testsuite/gdb.base/warning.exp b/gdb/testsuite/gdb.base/warning.exp new file mode 100644 index 0000000..53067f4 --- /dev/null +++ b/gdb/testsuite/gdb.base/warning.exp @@ -0,0 +1,36 @@ +# Copyright 2018 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 that an early warning does not cause a crash. + +if {[is_remote host]} { + unsupported "warning.exp can only run on local host" + return +} + +set tname [standard_temp_file warning] +set fd [open $tname w] +puts $fd "anything" +close $fd + +set save $INTERNAL_GDBFLAGS +set INTERNAL_GDBFLAGS "-nw -nx -data-directory $tname" + +gdb_start + +# Make sure gdb started up. +gdb_test "echo 23\\n" "23" + +set INTERNAL_GDBFLAGS $save |