diff options
| author | Tom Tromey <tom@tromey.com> | 2018-10-05 14:54:35 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-11-08 16:10:21 -0700 |
| commit | 20f0d60db4fb5083779c4c9182bbc692f7d2bac5 (patch) | |
| tree | 4b194b7c74bf9200bb4b3811c8b426843afa56a0 /gdb/target.c | |
| parent | d4718d5c9f9b5c41d88254429c61010c63139130 (diff) | |
| download | gdb-20f0d60db4fb5083779c4c9182bbc692f7d2bac5.zip gdb-20f0d60db4fb5083779c4c9182bbc692f7d2bac5.tar.gz gdb-20f0d60db4fb5083779c4c9182bbc692f7d2bac5.tar.bz2 | |
Avoid crash when calling warning too early
I noticed that if you pass the name of an existing file (not a
directory) as the argument to --data-directory, gdb will crash:
$ ./gdb -nx --data-directory ./gdb
../../binutils-gdb/gdb/target.c:590:56: runtime error: member call on null pointer of type 'struct target_ops'
This was later reported as PR gdb/23838.
This happens because warning ends up calling
target_supports_terminal_ours, which calls current_top_target, which
returns nullptr this early.
This fixes the problem by handling this case specially in
target_supports_terminal_ours. I also changed
target_supports_terminal_ours to return bool.
gdb/ChangeLog
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.
gdb/testsuite/ChangeLog
2018-11-08 Tom Tromey <tom@tromey.com>
PR gdb/23555:
PR gdb/23838:
* gdb.base/warning.exp: New file.
Diffstat (limited to 'gdb/target.c')
| -rw-r--r-- | gdb/target.c | 10 |
1 files changed, 8 insertions, 2 deletions
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 |