summaryrefslogtreecommitdiff
path: root/gdb/darwin-nat.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2018-06-04 12:26:39 +0100
committerPedro Alves <palves@redhat.com>2018-06-04 12:26:39 +0100
commit59f413d5412217c5c6f9e25d0279a1997426d60a (patch)
tree43c6f18700c57acb3c33f348ce22533ada6a33a6 /gdb/darwin-nat.c
parent1332a1400145b5cca04c4d1ea77e0191d8dc5727 (diff)
downloadbinutils-gdb-59f413d5412217c5c6f9e25d0279a1997426d60a.tar.gz
Fix macOS null pointer dereference
<https://sourceware.org/bugzilla/show_bug.cgi?id=22960#c4> reports that macOS gdb crashes with a null pointer dereference in push_target(struct target_ops *). This commit fixes that. The problem is that commit f6ac5f3d63e0 ("Convert struct target_ops to C++") left the darwin_ops global uninitialized. We don't need that global anymore, we can use the (new) get_native_target function instead for the same effect. gdb/ChangeLog: 2018-06-04 Pedro Alves <palves@redhat.com> * darwin-nat.c (darwin_ops): Delete. (darwin_attach_pid): Use get_native_target.
Diffstat (limited to 'gdb/darwin-nat.c')
-rw-r--r--gdb/darwin-nat.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 0b1a4910a30..ed1ed328989 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -97,9 +97,6 @@ static void darwin_deallocate_exception_ports (darwin_inferior *inf);
static void darwin_setup_exceptions (struct inferior *inf);
static void darwin_deallocate_threads (struct inferior *inf);
-/* Target operations for Darwin. */
-static struct target_ops *darwin_ops;
-
/* Task identifier of gdb. */
static task_t gdb_task;
@@ -1656,6 +1653,7 @@ darwin_attach_pid (struct inferior *inf)
darwin_setup_exceptions (inf);
+ target_ops *darwin_ops = get_native_target ();
if (!target_is_pushed (darwin_ops))
push_target (darwin_ops);
}