From aeeb81d1c7aae4a550685fee010a02f0c37ec57e Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 26 Nov 2009 22:18:40 +0000 Subject: [PATCH] * win32-low.c (get_child_debug_event): On EXIT_THREAD_DEBUG_EVENT events, don't leave current_inferior pointing at null. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/win32-low.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 64619ee2a53..81707a7c397 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2009-11-26 Pedro Alves + + * win32-low.c (get_child_debug_event): On EXIT_THREAD_DEBUG_EVENT + events, don't leave current_inferior pointing at null. + 2009-11-26 Pedro Alves * win32-low.c (LOG): Delete. diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 3b9ae591329..57633f14965 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -1438,10 +1438,6 @@ get_child_debug_event (struct target_waitstatus *ourstatus) gotevent: - ptid = debug_event_ptid (¤t_event); - current_inferior = - (struct thread_info *) find_inferior_id (&all_threads, ptid); - switch (current_event.dwDebugEventCode) { case CREATE_THREAD_DEBUG_EVENT: @@ -1463,7 +1459,9 @@ get_child_debug_event (struct target_waitstatus *ourstatus) (unsigned) current_event.dwThreadId)); child_delete_thread (current_event.dwProcessId, current_event.dwThreadId); - break; + + current_inferior = (struct thread_info *) all_threads.head; + return 1; case CREATE_PROCESS_DEBUG_EVENT: OUTMSG2 (("gdbserver: kernel event CREATE_PROCESS_DEBUG_EVENT " @@ -1558,6 +1556,7 @@ get_child_debug_event (struct target_waitstatus *ourstatus) break; } + ptid = debug_event_ptid (¤t_event); current_inferior = (struct thread_info *) find_inferior_id (&all_threads, ptid); return 1; -- 2.30.2