From: Pedro Alves <palves@redhat.com>
Date: Fri, 13 Jan 2012 20:02:36 +0000 (+0000)
Subject: 2012-01-13  Pedro Alves  <palves@redhat.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f128d5e9da0bd12c7f0b75ea2c6289ff61e85a52;p=binutils-gdb.git

2012-01-13  Pedro Alves  <palves@redhat.com>

	* server.c (main): Avoid infinite loop while detaching/killing
	after a longjmp.
---

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4bbba373e22..89a4cdde127 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-13  Pedro Alves  <palves@redhat.com>
+
+	* server.c (main): Avoid infinite loop while detaching/killing
+	after a longjmp.
+
 2012-01-09  Doug Evans  <dje@google.com>
 
 	* server.c (start_inferior): Set last_ptid in --wrapper case.
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index a3bc6c9c2e3..f312a5c650a 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -2719,6 +2719,16 @@ main (int argc, char *argv[])
 
   if (setjmp (toplevel))
     {
+      /* If something fails and longjmps while detaching or killing
+	 inferiors, we'd end up here again, stuck in an infinite loop
+	 trap.  Be sure that if that happens, we exit immediately
+	 instead.  */
+      if (setjmp (toplevel))
+	{
+	  fprintf (stderr, "Detach or kill failed.  Exiting\n");
+	  exit (1);
+	}
+
       detach_or_kill_for_exit ();
       exit (1);
     }