From 5fe41fbfa22275d2a277b408bf52fedec34e8336 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 27 Jun 2011 19:21:51 +0000 Subject: * valops.c (find_overload_match): Call do_cleanups before early return. * top.c (execute_command): Call do_cleanups before early return. (command_loop): Likewise. * stack.c (backtrace_command): Make a null cleanup early. Don't conditionally call do_cleanups. * python/py-value.c (TRY_CATCH): Move cleanup handling into TRY_CATCH. * python/py-breakpoint.c (gdbpy_breakpoint_has_py_cond): Rearrange so cleanups are always run. * mi/mi-cmd-var.c (mi_cmd_var_delete): Reset old_cleanups. * findcmd.c (parse_find_args): Call do_cleanups on early return path. * dbxread.c (elfstab_build_psymtabs): Make a null cleanup early. Don't conditionally call do_cleanups. * cli/cli-script.c (execute_user_command): Initialize 'old_chain' later. --- gdb/cli/cli-script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/cli/cli-script.c') diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 2d1afe5..c94f7ee 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -317,13 +317,13 @@ execute_user_command (struct cmd_list_element *c, char *args) static int user_call_depth = 0; extern int max_user_call_depth; - old_chain = setup_user_args (args); - cmdlines = c->user_commands; if (cmdlines == 0) /* Null command */ return; + old_chain = setup_user_args (args); + if (++user_call_depth > max_user_call_depth) error (_("Max user call depth exceeded -- command aborted.")); -- cgit v1.1