diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/cli/cli-script.c | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 23 |
4 files changed, 35 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8253c23..45a83e0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2006-03-30 Daniel Jacobowitz <dan@codesourcery.com> + * cli/cli-script.c (insert_args): Handle NULL user_args. + +2006-03-30 Daniel Jacobowitz <dan@codesourcery.com> + * arm-tdep.c (thumb_scan_prologue): Don't try to analyze the function at zero if we have no symbols. diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index b8e9d4f..b447b44 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -593,6 +593,11 @@ insert_args (char *line) char *p, *save_line, *new_line; unsigned len, i; + /* If we are not in a user-defined function, treat $argc, $arg0, et + cetera as normal convenience variables. */ + if (user_args == NULL) + return xstrdup (line); + /* First we need to know how much memory to allocate for the new line. */ save_line = line; len = 0; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8347189..1b4a794 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2006-03-30 Daniel Jacobowitz <dan@codesourcery.com> + + * gdb.base/commands.exp (stray_arg0_test): New test. + 2006-03-30 Paul Brook <paul@codesourcery.com> * gdb.mi/mi-until.exp: kfail broken until command. diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index eabf85e..893c98c 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -1,5 +1,5 @@ # Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1997, 1998, 1999, 2000, -# 2001, 2002, 2003 Free Software Foundation, Inc. +# 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -563,6 +563,26 @@ proc temporary_breakpoint_commands {} { timeout { fail "(timeout) run factorial until temporary breakpoint" } } } + +# Test that GDB can handle $arg0 outside of user functions without +# crashing. +proc stray_arg0_test { } { + gdb_test "print \$arg0" \ + "\\\$\[0-9\]* = void" \ + "stray_arg0_test #1" + + gdb_test "if 1 == 1\nprint \$arg0\nend" \ + "\\\$\[0-9\]* = void" \ + "stray_arg0_test #2" + + gdb_test "print \$arg0 = 1" \ + "\\\$\[0-9\]* = 1" \ + "stray_arg0_test #3" + + gdb_test "print \$arg0" \ + "\\\$\[0-9\]* = 1" \ + "stray_arg0_test #4" +} gdbvar_simple_if_test gdbvar_simple_while_test @@ -579,3 +599,4 @@ test_command_prompt_position deprecated_command_test bp_deleted_in_command_test temporary_breakpoint_commands +stray_arg0_test |