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.
This commit is contained in:
Don Howard
2002-04-12 22:31:23 +00:00
parent a88376a3e1
commit 20f01a4665
5 changed files with 51 additions and 0 deletions

View File

@ -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