Fix macOS null pointer dereference

Message ID 20180524124407.4324-1-palves@redhat.com
State New
Headers show
Series
  • Fix macOS null pointer dereference
Related show

Commit Message

Pedro Alves May 24, 2018, 12:44 p.m.
Saagar, could you give this a try?

<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:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* darwin-nat.c (darwin_ops): Delete.
	(darwin_attach_pid): Use get_native_target.
---
 gdb/darwin-nat.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
2.14.3

Comments

Pedro Alves June 4, 2018, 11:32 a.m. | #1
On 05/24/2018 01:44 PM, Pedro Alves wrote:
> Saagar, could you give this a try?


I've merged this, given the discussion on the bug.

Thanks,
Pedro Alves
Saagar Jha June 5, 2018, 12:30 p.m. | #2
Great, that’s one less thing we need to worry about now.

Saagar Jha

> On Jun 4, 2018, at 04:32, Pedro Alves <palves@redhat.com> wrote:

> 

> On 05/24/2018 01:44 PM, Pedro Alves wrote:

>> Saagar, could you give this a try?

> 

> I've merged this, given the discussion on the bug.

> 

> Thanks,

> Pedro Alves

Patch

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 0b1a4910a3..ed1ed32898 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);
 }