From 20f01a4665aec81bd667feb25cab93a8bbe3c9af Mon Sep 17 00:00:00 2001 From: Don Howard Date: Fri, 12 Apr 2002 22:31:23 +0000 Subject: [PATCH] 2002-04-12 Don Howard * 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. --- gdb/ChangeLog | 9 +++++++++ gdb/NEWS | 5 +++++ gdb/cli/cli-cmds.c | 12 ++++++++++++ gdb/cli/cli-script.c | 18 ++++++++++++++++++ gdb/doc/gdb.texinfo | 7 +++++++ 5 files changed, 51 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aa4b1dbb12c..bca2712cd34 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2002-04-12 Don Howard + + * 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. + 2002-04-12 Kevin Buettner * ppc-tdep.h (struct gdbarch_tdep): Add new member ``lr_frame_offset''. diff --git a/gdb/NEWS b/gdb/NEWS index 23777175fef..65621ff6fa4 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -3,6 +3,11 @@ *** Changes since GDB 5.2: +* New command "set max-user-call-depth " + +This command allows the user to limit the call depth of user-defined +commands. The default is 1024. + * Changes in FreeBSD/i386 native debugging. Support for the "generate-core-file" has been added. 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 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 028ee34e19d..12e49935110 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -12781,6 +12781,13 @@ Display the @value{GDBN} commands used to define @var{commandname} (but not its documentation). If no @var{commandname} is given, display the definitions for all user-defined commands. +@kindex show max-user-call-depth +@kindex set max-user-call-depth +@item show max-user-call-depth +@item set max-user-call-depth +The value of @code{max-user-call-depth} controls how many levels deep a +user-defined call chain can go. Default is 1024. + @end table When user-defined commands are executed, the -- 2.30.2