summaryrefslogtreecommitdiff
path: root/gdb/cli
diff options
context:
space:
mode:
authorDon Howard <dhoward@redhat.com>2002-04-12 22:31:23 +0000
committerDon Howard <dhoward@redhat.com>2002-04-12 22:31:23 +0000
commit707c1559747c271c1f1d67c5192b5efc3a402ae4 (patch)
tree278f81cb73bdd7107ae81bd45bb77b213bc867ca /gdb/cli
parent75135ba3b2e3f37858c7be844855ef809e7d3b90 (diff)
downloadgdb-707c1559747c271c1f1d67c5192b5efc3a402ae4.tar.gz
2002-04-12 Don Howard <dhoward@redhat.com>
* cli/cli-cmds.c (init_cli_cmds): Add new user settable value: max_user_call_depth. (init_cmd_lists): Initialize the new value; * cli/cli-script.c (execute_user_command): Limit the call depth of user defined commands. This avoids a core-dump when user commands are infinitly recursive.
Diffstat (limited to 'gdb/cli')
-rw-r--r--gdb/cli/cli-cmds.c12
-rw-r--r--gdb/cli/cli-script.c18
2 files changed, 30 insertions, 0 deletions
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 6ba686fce42..bcd9a42e1b5 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -80,6 +80,9 @@ static void shell_escape (char *, int);
void apropos_command (char *, int);
+/* Limit the call depth of user-defined commands */
+int max_user_call_depth;
+
/* Define all cmd_list_elements. */
/* Chain containing all defined commands. */
@@ -606,6 +609,8 @@ show_debug (char *args, int from_tty)
void
init_cmd_lists (void)
{
+ max_user_call_depth = 1024;
+
cmdlist = NULL;
infolist = NULL;
enablelist = NULL;
@@ -823,4 +828,11 @@ With no arguments, run an inferior shell.");
Argument is the name of the user defined command.\n\
With no argument, show definitions of all user defined commands.", &showlist);
add_com ("apropos", class_support, apropos_command, "Search for commands matching a REGEXP");
+
+ add_show_from_set (
+ add_set_cmd ("max-user-call-depth", no_class, var_integer,
+ (char *) &max_user_call_depth,
+ "Set the max call depth for user-defined commands.\n",
+ &setlist),
+ &showlist);
}
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index b438fef02df..fc3261c7ade 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -247,6 +247,15 @@ execute_cmd_post_hook (struct cmd_list_element *c)
}
/* Execute the command in CMD. */
+void
+do_restore_user_call_depth (void * call_depth)
+{
+ int * depth = call_depth;
+ /* We will be returning_to_top_level() at this point, so we want to
+ reset our depth. */
+ (*depth) = 0;
+}
+
void
execute_user_command (struct cmd_list_element *c, char *args)
@@ -254,6 +263,8 @@ execute_user_command (struct cmd_list_element *c, char *args)
register struct command_line *cmdlines;
struct cleanup *old_chain;
enum command_control_type ret;
+ static int user_call_depth = 0;
+ extern int max_user_call_depth;
old_chain = setup_user_args (args);
@@ -262,6 +273,11 @@ execute_user_command (struct cmd_list_element *c, char *args)
/* Null command */
return;
+ if (++user_call_depth > max_user_call_depth)
+ error ("Max user call depth exceeded -- command aborted\n");
+
+ old_chain = make_cleanup (do_restore_user_call_depth, &user_call_depth);
+
/* Set the instream to 0, indicating execution of a
user-defined function. */
old_chain = make_cleanup (do_restore_instream_cleanup, instream);
@@ -277,6 +293,8 @@ execute_user_command (struct cmd_list_element *c, char *args)
cmdlines = cmdlines->next;
}
do_cleanups (old_chain);
+
+ user_call_depth--;
}
enum command_control_type