From: Pedro Alves <palves@redhat.com>
Date: Mon, 4 Jun 2018 11:26:39 +0000 (+0100)
Subject: Fix macOS null pointer dereference
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59f413d5412217c5c6f9e25d0279a1997426d60a;p=binutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f3b616fef46..a292f4c0569 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-04  Pedro Alves  <palves@redhat.com>
+
+	* darwin-nat.c (darwin_ops): Delete.
+	(darwin_attach_pid): Use get_native_target.
+
 2018-06-04  Alan Hayward  <alan.hayward@arm.com>
 
 	* aarch64-tdep.c (aarch64_get_tdesc_vq): Use uint64_t for VQ.
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);
 }