From 7fa7584a1e65ad78812f318358357b08b4b2affe Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 22 Dec 2010 18:23:38 +0000 Subject: [PATCH] * inferior.c (remove_inferior_command): Don't remove an active inferior. * mi/mi-main.c (mi_cmd_remove_inferior): Ditto. --- gdb/ChangeLog | 5 +++++ gdb/inferior.c | 3 +++ gdb/mi/mi-main.c | 3 +++ 3 files changed, 11 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0f9f4e0f54d..7ff1b371289 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-12-22 Marc Khouzam + + * inferior.c (remove_inferior_command): Don't remove an active inferior. + * mi/mi-main.c (mi_cmd_remove_inferior): Ditto. + 2010-12-17 Marc Khouzam * mi/mi-main.c (mi_cmd_remove_inferior): Don't delete current inferior. diff --git a/gdb/inferior.c b/gdb/inferior.c index 28c586792b8..3ae87d76b7d 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -741,6 +741,9 @@ remove_inferior_command (char *args, int from_tty) if (inf == current_inferior ()) error (_("Can not remove current symbol inferior.")); + + if (inf->pid != 0) + error (_("Can not remove an active inferior.")); delete_inferior_1 (inf, 1); } diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 1084155fd07..8d622e92216 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1651,6 +1651,9 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc) if (!inf) error ("the specified thread group does not exist"); + if (inf->pid != 0) + error ("can not remove an active inferior"); + if (inf == current_inferior ()) { struct thread_info *tp = 0; -- 2.39.5