* inferiors.c (find_inferior): Make it safe for the callback

	function to delete the currently iterated inferior.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 5060258..f4a5ca7 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-22  Pedro Alves  <pedro@codesourcery.com>
 
+       * inferiors.c (find_inferior): Make it safe for the callback
+       function to delete the currently iterated inferior.
+
+2009-03-22  Pedro Alves  <pedro@codesourcery.com>
+
        * Makefile.in (linuw_low_h): Move higher.
        (thread-db.o): Depend on $(linux_low_h).
 

diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index bebec9a..8ad64fa 100644 (file)
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -180,9 +180,12 @@ find_inferior (struct inferior_list *list,
 
   while (inf != NULL)
     {
+      struct inferior_list_entry *next;
+
+      next = inf->next;
       if ((*func) (inf, arg))
        return inf;
-      inf = inf->next;
+      inf = next;
     }
 
   return NULL;