diff options
author | Don Breazeal <donb@codesourcery.com> | 2016-03-15 15:18:28 -0700 |
---|---|---|
committer | Don Breazeal <donb@codesourcery.com> | 2016-03-15 15:25:15 -0700 |
commit | 1cafadb4e4eb329dea01355c6632b3077113d80c (patch) | |
tree | 2aa982ab01ff1f0649de210f67bdada496a42e0a /gdb/testsuite/gdb.linespec | |
parent | 79427bd2f8edb59110f16a9c1652e3d6e41e08e7 (diff) | |
download | binutils-gdb-1cafadb4e4eb329dea01355c6632b3077113d80c.tar.gz |
PR 18303, Tolerate malformed input for lookup_symbol-called functions
lookup_symbol is often called with user input. Consequently, any
function called from lookup_symbol{,_in_language} should attempt to
deal with malformed input gracefully. After all, malformed user
input is not a programming/API error.
This patch does not attempt to find/correct all instances of this. It
only fixes locations in the code that trigger test suite failures.
This patch fixes PR breakpoints/18303, "Assertion: -breakpoint-insert
with windows paths of file in non-current directory".
The patch includes three new tests related to this. One is just
gdb.linespec/ls-errs.exp copied and converted to use C++ instead of C, and
to add a case using a file name containing a Windows-style logical drive
specifier. The others include an MI test to provide a regression test for
the specific case reported in PR 18303, and a C++ test for proper error
handling of access to a program variable when using a file scope specifier
that refers to a non-existent file.
Tested on x86_64 native Linux.
gdb/ChangeLog
2016-01-28 Keith Seitz <keiths@redhat.com>
PR breakpoints/18303
* cp-namespace.c (cp_lookup_bare_symbol): Change assertion to
look for "::" instead of simply ":".
(cp_search_static_and_baseclasses): Return null_block_symbol for
malformed input.
Remove assertions.
* cp-support.c (cp_find_first_component_aux): Do not return
a prefix length for ':' unless the next character is also ':'.
gdb/testsuite/ChangeLog
2016-01-28 Don Breazeal <donb@codesourcery.com>
* gdb.cp/scope-err.cc: New test program.
* gdb.cp/scope-err.exp: New test script.
* gdb.linespec/ls-errs.c (myfunction): Expanded to have multiple
lines and "set breakpoint here" comment.
* gdb.linespec/ls-errs.exp: Added C++ testing and new test case.
Fixed some whitespace and format issues.
* gdb.mi/mi-linespec-err-cp.cc: New test program.
* gdb.mi/mi-linespec-err-cp.exp: New test script.
Diffstat (limited to 'gdb/testsuite/gdb.linespec')
-rw-r--r-- | gdb/testsuite/gdb.linespec/ls-errs.c | 13 | ||||
-rw-r--r-- | gdb/testsuite/gdb.linespec/ls-errs.exp | 386 |
2 files changed, 223 insertions, 176 deletions
diff --git a/gdb/testsuite/gdb.linespec/ls-errs.c b/gdb/testsuite/gdb.linespec/ls-errs.c index ca41342eb04..a3a43dbc24e 100644 --- a/gdb/testsuite/gdb.linespec/ls-errs.c +++ b/gdb/testsuite/gdb.linespec/ls-errs.c @@ -15,14 +15,21 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -int myfunction (void) { return 0; } +int +myfunction (int aa) +{ + int i; + + i = aa + 42; + return i; /* set breakpoint here */ +} int main (void) -{ +{ int a; - a = myfunction (); + a = myfunction (a); here: return a; diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp index 16d4574c21e..bc4ca2673c1 100644 --- a/gdb/testsuite/gdb.linespec/ls-errs.exp +++ b/gdb/testsuite/gdb.linespec/ls-errs.exp @@ -13,209 +13,249 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Tests for linespec error conditions +# Tests for linespec errors with C and C++. -standard_testfile -set exefile $testfile +# The test proper. LANG is either C or C++. -if {[prepare_for_testing $testfile $exefile $srcfile \ - {debug nowarnings}]} { - return -1 -} +proc do_test {lang} { + global testfile srcfile error_messages compiler_info -# Turn off the pending breakpoint queries. -gdb_test_no_output "set breakpoint pending off" + standard_testfile + set exefile $testfile + if [info exists compiler_info] { + # Unsetting compiler_info allows us to switch compilers + # used by prepare_for_testing. + unset compiler_info + } + set options {debug} + + if {$lang == "C++"} { + if {[skip_cplus_tests]} { + return 0 + } + # Build ".c" source file with g++. + lappend options "c++" + } -# Turn off completion limiting -gdb_test_no_output "set max-completions unlimited" + if {[prepare_for_testing $testfile $exefile $srcfile $options]} { + return -1 + } -# We intentionally do not use gdb_breakpoint for these tests. + # Turn off the pending breakpoint queries. + gdb_test_no_output "set breakpoint pending off" -# Break at 'linespec' and expect the message in ::error_messages indexed by -# msg_id with the associated args. -proc test_break {linespec msg_id args} { - global error_messages + # Turn off completion limiting + gdb_test_no_output "set max-completions unlimited" - gdb_test "break $linespec" [string_to_regexp \ - [eval format \$error_messages($msg_id) $args]] -} + if {![runto_main]} { + fail "Can't run to main" + return 0 + } -# Common error message format strings. -array set error_messages { - invalid_file "No source file named %s." - invalid_function "Function \"%s\" not defined." - invalid_var_or_func "Undefined convenience variable or function \"%s\" not defined." - invalid_function_f "Function \"%s\" not defined in \"%s\"." - invalid_var_or_func_f \ - "Undefined convenience variable or function \"%s\" not defined in \"%s\"." - invalid_label "No label \"%s\" defined in function \"%s\"." - invalid_parm "invalid linespec argument, \"%s\"" - invalid_offset "No line %d in the current file." - invalid_offset_f "No line %d in file \"%s\"." - malformed_line_offset "malformed line offset: \"%s\"" - source_incomplete \ - "Source filename requires function, label, or line offset." - unexpected "malformed linespec error: unexpected %s" - unexpected_opt "malformed linespec error: unexpected %s, \"%s\"" - unmatched_quote "unmatched quote" - garbage "Garbage '%s' at end of command" -} + # Run to a location in the file. + set bp_location [gdb_get_line_number "set breakpoint here"] + + gdb_test "break $srcfile:$bp_location" \ + "Breakpoint.*at.* file .*$srcfile, line $bp_location\\." \ + "breakpoint line number in file" + + gdb_continue_to_breakpoint "$bp_location" + + # Common error message format strings. + array set error_messages { + invalid_file "No source file named %s." + invalid_function "Function \"%s\" not defined." + invalid_var_or_func + "Undefined convenience variable or function \"%s\" not defined." + invalid_function_f "Function \"%s\" not defined in \"%s\"." + invalid_var_or_func_f \ + "Undefined convenience variable or function \"%s\" not defined in \"%s\"." + invalid_label "No label \"%s\" defined in function \"%s\"." + invalid_parm "invalid linespec argument, \"%s\"" + invalid_offset "No line %d in the current file." + invalid_offset_f "No line %d in file \"%s\"." + malformed_line_offset "malformed line offset: \"%s\"" + source_incomplete \ + "Source filename requires function, label, or line offset." + unexpected "malformed linespec error: unexpected %s" + unexpected_opt "malformed linespec error: unexpected %s, \"%s\"" + unmatched_quote "unmatched quote" + garbage "Garbage '%s' at end of command" + } -# Some commonly used whitespace tests around ':'. -set spaces [list ":" ": " " :" " : " "\t: " " :\t" "\t:\t" " \t:\t " \ - "\t \t:\t \t \t"] + # We intentionally do not use gdb_breakpoint for these tests. -# A list of invalid offsets. -set invalid_offsets [list -100 +500 1000] + # Break at 'linespec' and expect the message in ::error_messages + # indexed by msg_id with the associated args. + proc test_break {linespec msg_id args} { + global error_messages -# Try some simple, invalid linespecs involving spaces. -foreach x $spaces { - test_break $x unexpected "colon" -} + gdb_test "break $linespec" [string_to_regexp \ + [eval format \$error_messages($msg_id) \ + $args]] + } -# Test invalid filespecs starting with offset. This is done -# first so that default offsets are tested. -foreach x $invalid_offsets { - set offset $x + # Some commonly used whitespace tests around ':'. + set spaces [list ":" ": " " :" " : " "\t: " " :\t" "\t:\t" \ + " \t:\t " "\t \t:\t \t \t"] - # Relative offsets are relative to line 16. Adjust - # expected offset from error message accordingly. - if {[string index $x 0] == "+" || - [string index $x 0] == "-"} { - incr offset 16 - } - test_break $x invalid_offset $offset - test_break "-line $x" invalid_offset $offset -} + # A list of invalid offsets. + set invalid_offsets [list -100 +500 1000] -# Test offsets with trailing tokens w/ and w/o spaces. -foreach x $spaces { - test_break "3$x" unexpected "colon" - test_break "+10$x" unexpected "colon" - test_break "-10$x" unexpected "colon" -} + # Try some simple, invalid linespecs involving spaces. + foreach x $spaces { + test_break $x unexpected "colon" + } -foreach x {1 +1 +100 -10} { - test_break "3 $x" unexpected_opt "number" $x - test_break "-line 3 $x" garbage $x - test_break "+10 $x" unexpected_opt "number" $x - test_break "-line +10 $x" garbage $x - test_break "-10 $x" unexpected_opt "number" $x - test_break "-line -10 $x" garbage $x -} + # Test invalid filespecs starting with offset. This is done + # first so that default offsets are tested. + foreach x $invalid_offsets { + set offset $x + + # Relative offsets are relative to line 16. Adjust + # expected offset from error message accordingly. + if {[string index $x 0] == "+" || [string index $x 0] == "-"} { + incr offset 24 + } + test_break $x invalid_offset $offset + test_break "-line $x" invalid_offset $offset + } -foreach x {3 +10 -10} { - test_break "$x foo" unexpected_opt "string" "foo" - test_break "-line $x foo" garbage "foo" -} + # Test offsets with trailing tokens w/ and w/o spaces. + foreach x $spaces { + test_break "3$x" unexpected "colon" + test_break "+10$x" unexpected "colon" + test_break "-10$x" unexpected "colon" + } -# Test invalid linespecs starting with filename. -foreach x [list "this_file_doesn't_exist.c" \ - "this file has spaces.c" \ - "\"file::colons.c\"" \ - "'file::colons.c'" \ - "\"this \"file\" has quotes.c\"" \ - "'this \"file\" has quotes.c'" \ - "'this 'file' has quotes.c'" \ - "\"this 'file' has quotes.c\"" \ - "\"spaces: and :colons.c\"" \ - "'more: :spaces: :and colons::.c'"] { - # Remove any quoting from FILENAME for the error message. - test_break "$x:3" invalid_file [string trim $x \"'] -} -foreach x [list "this_file_doesn't_exist.c" \ - "file::colons.c" \ - "'file::colons.c'"] { - test_break "-source $x -line 3" \ - invalid_file [string trim $x \"'] -} + foreach x {1 +1 +100 -10} { + test_break "3 $x" unexpected_opt "number" $x + test_break "-line 3 $x" garbage $x + test_break "+10 $x" unexpected_opt "number" $x + test_break "-line +10 $x" garbage $x + test_break "-10 $x" unexpected_opt "number" $x + test_break "-line -10 $x" garbage $x + } -# Test that option lexing stops at whitespace boundaries -test_break "-source this file has spaces.c -line 3" \ - invalid_file "this" + foreach x {3 +10 -10} { + test_break "$x foo" unexpected_opt "string" "foo" + test_break "-line $x foo" garbage "foo" + } -test_break "-function function whitespace" \ - invalid_function "function" + # Test invalid linespecs starting with filename. + # It's OK to use the ".c" extension for the C++ test + # since the extension doesn't affect GDB's lookup. + set invalid_files [list "this_file_doesn't_exist.c" \ + "this file has spaces.c" \ + "\"file::colons.c\"" \ + "'file::colons.c'" \ + "\"this \"file\" has quotes.c\"" \ + "'this \"file\" has quotes.c'" \ + "'this 'file' has quotes.c'" \ + "\"this 'file' has quotes.c\"" \ + "\"spaces: and :colons.c\"" \ + "'more: :spaces: :and colons::.c'" \ + "C:/nonexist-with-windrive.c"] + + foreach x $invalid_files { + # Remove any quoting from FILENAME for the error message. + test_break "$x:3" invalid_file [string trim $x \"'] + } + foreach x [list "this_file_doesn't_exist.c" \ + "file::colons.c" \ + "'file::colons.c'"] { + test_break "-source $x -line 3" invalid_file [string trim $x \"'] + } -test_break "-source $srcfile -function function whitespace" \ - invalid_function_f "function" $srcfile + # Test that option lexing stops at whitespace boundaries + test_break "-source this file has spaces.c -line 3" invalid_file "this" + test_break "-function function whitespace" invalid_function "function" + test_break "-source $srcfile -function function whitespace" \ + invalid_function_f "function" $srcfile -test_break "-function main -label label whitespace" \ - invalid_label "label" "main" + test_break "-function main -label label whitespace" \ + invalid_label "label" "main" -# Test unmatched quotes. -foreach x {"\"src-file.c'" "'src-file.c"} { - test_break "$x:3" unmatched_quote -} + # Test unmatched quotes. + foreach x {"\"src-file.c'" "'src-file.c"} { + test_break "$x:3" unmatched_quote + } -test_break $srcfile invalid_function $srcfile -foreach x {"foo" " foo" " foo "} { - # Trim any leading/trailing whitespace for error messages. - test_break "$srcfile:$x" invalid_function_f [string trim $x] $srcfile - test_break "-source $srcfile -function $x" \ - invalid_function_f [string trim $x] $srcfile - test_break "$srcfile:main:$x" invalid_label [string trim $x] "main" - test_break "-source $srcfile -function main -label $x" \ - invalid_label [string trim $x] "main" -} + test_break $srcfile invalid_function $srcfile + foreach x {"foo" " foo" " foo "} { + # Trim any leading/trailing whitespace for error messages. + test_break "$srcfile:$x" invalid_function_f [string trim $x] $srcfile + test_break "-source $srcfile -function $x" \ + invalid_function_f [string trim $x] $srcfile + test_break "$srcfile:main:$x" invalid_label [string trim $x] "main" + test_break "-source $srcfile -function main -label $x" \ + invalid_label [string trim $x] "main" + } -foreach x $spaces { - test_break "$srcfile$x" unexpected "end of input" - test_break "$srcfile:main$x" unexpected "end of input" -} + foreach x $spaces { + test_break "$srcfile$x" unexpected "end of input" + test_break "$srcfile:main$x" unexpected "end of input" + } -test_break "${srcfile}::" invalid_function "${srcfile}::" -test_break "$srcfile:3 1" unexpected_opt "number" "1" -test_break "-source $srcfile -line 3 1" garbage "1" -test_break "$srcfile:3 +100" unexpected_opt "number" "+100" -test_break "-source $srcfile -line 3 +100" garbage "+100" -test_break "$srcfile:3 -100" unexpected_opt "number" "-100" -test_break "$srcfile:3 foo" unexpected_opt "string" "foo" -test_break "-source $srcfile -line 3 foo" garbage "foo" - -foreach x $invalid_offsets { - test_break "$srcfile:$x" invalid_offset_f $x $srcfile - test_break "\"$srcfile:$x\"" invalid_offset_f $x $srcfile - test_break "'$srcfile:$x'" invalid_offset_f $x $srcfile - test_break "-source $srcfile -line $x" invalid_offset_f $x $srcfile -} -test_break "-source $srcfile -line -x" malformed_line_offset "-x" + test_break "${srcfile}::" invalid_function "${srcfile}::" + test_break "$srcfile:3 1" unexpected_opt "number" "1" + test_break "-source $srcfile -line 3 1" garbage "1" + test_break "$srcfile:3 +100" unexpected_opt "number" "+100" + test_break "-source $srcfile -line 3 +100" garbage "+100" + test_break "$srcfile:3 -100" unexpected_opt "number" "-100" + test_break "$srcfile:3 foo" unexpected_opt "string" "foo" + test_break "-source $srcfile -line 3 foo" garbage "foo" + + foreach x $invalid_offsets { + test_break "$srcfile:$x" invalid_offset_f $x $srcfile + test_break "\"$srcfile:$x\"" invalid_offset_f $x $srcfile + test_break "'$srcfile:$x'" invalid_offset_f $x $srcfile + test_break "-source $srcfile -line $x" invalid_offset_f $x $srcfile + } + test_break "-source $srcfile -line -x" malformed_line_offset "-x" -# Test invalid filespecs starting with function. -foreach x {"foobar" "foo::bar" "foo.bar" "foo ." "foo bar" "foo 1" \ + # Test invalid filespecs starting with function. + foreach x {"foobar" "foo::bar" "foo.bar" "foo ." "foo bar" "foo 1" \ "foo 0" "foo +10" "foo -10" "foo +100" "foo -100"} { - test_break $x invalid_function $x - test_break "-function \"$x\"" invalid_function $x -} + test_break $x invalid_function $x + test_break "-function \"$x\"" invalid_function $x + } -foreach x $spaces { - test_break "main${x}there" invalid_label "there" "main" - if {[test_compiler_info {clang-*-*}]} { setup_xfail clang/14500 *-*-* } - test_break "main:here${x}" unexpected "end of input" -} + foreach x $spaces { + test_break "main${x}there" invalid_label "there" "main" + if {[test_compiler_info {clang-*-*}]} { + setup_xfail clang/14500 *-*-* + } + test_break "main:here${x}" unexpected "end of input" + } -foreach x {"3" "+100" "-100" "foo"} { - test_break "main 3" invalid_function "main 3" - test_break "-function \"main $x\"" invalid_function "main $x" - test_break "main:here $x" invalid_label "here $x" "main" - test_break "-function main -label \"here $x\"" \ - invalid_label "here $x" "main" -} + foreach x {"3" "+100" "-100" "foo"} { + test_break "main 3" invalid_function "main 3" + test_break "-function \"main $x\"" invalid_function "main $x" + test_break "main:here $x" invalid_label "here $x" "main" + test_break "-function main -label \"here $x\"" \ + invalid_label "here $x" "main" + } -foreach x {"if" "task" "thread"} { - test_break $x invalid_function $x -} + foreach x {"if" "task" "thread"} { + test_break $x invalid_function $x + } -test_break "'main.c'flubber" unexpected_opt "string" "flubber" -test_break "'main.c',21" invalid_function "main.c" -test_break "'main.c' " invalid_function "main.c" -test_break "'main.c'3" unexpected_opt "number" "3" -test_break "'main.c'+3" unexpected_opt "number" "+3" + test_break "'main.c'flubber" unexpected_opt "string" "flubber" + test_break "'main.c',21" invalid_function "main.c" + test_break "'main.c' " invalid_function "main.c" + test_break "'main.c'3" unexpected_opt "number" "3" + test_break "'main.c'+3" unexpected_opt "number" "+3" -# Test undefined convenience variables. -set x {$zippo} -test_break $x invalid_var_or_func $x -test_break "$srcfile:$x" invalid_var_or_func_f $x $srcfile + # Test undefined convenience variables. + set x {$zippo} + test_break $x invalid_var_or_func $x + test_break "$srcfile:$x" invalid_var_or_func_f $x $srcfile -# Explicit linespec-specific tests -test_break "-source $srcfile" source_incomplete + # Explicit linespec-specific tests + test_break "-source $srcfile" source_incomplete +} + +foreach_with_prefix lang {"C" "C++"} { + do_test ${lang} +} |