diff options
| author | Tom Tromey <tromey@adacore.com> | 2023-05-01 10:10:29 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2023-05-01 10:10:29 -0600 |
| commit | 87c84f07a0a1b7e12b6a0c9b21cc0e021e460786 (patch) | |
| tree | e6ad017a72b194b6f7ca6c03bc3a4db696f66dc7 | |
| parent | c819a3380fc1b110b88bc6ab5ef9323dbe7d4753 (diff) | |
| download | gdb-87c84f07a0a1b7e12b6a0c9b21cc0e021e460786.zip gdb-87c84f07a0a1b7e12b6a0c9b21cc0e021e460786.tar.gz gdb-87c84f07a0a1b7e12b6a0c9b21cc0e021e460786.tar.bz2 | |
Fix crash in Rust expression parser
A user found that an array expression with just a single value (like
"[23]") caused the Rust expression parser to crash.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30410
| -rw-r--r-- | gdb/rust-parse.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.rust/expr.exp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c index 6c7922d..648e48d 100644 --- a/gdb/rust-parse.c +++ b/gdb/rust-parse.c @@ -1190,7 +1190,7 @@ rust_parser::parse_array () result = make_operation<rust_array_operation> (std::move (expr), std::move (rhs)); } - else if (current_token == ',') + else if (current_token == ',' || current_token == ']') { std::vector<operation_up> ops; ops.push_back (std::move (expr)); @@ -1205,7 +1205,7 @@ rust_parser::parse_array () int len = ops.size () - 1; result = make_operation<array_operation> (0, len, std::move (ops)); } - else if (current_token != ']') + else error (_("',', ';', or ']' expected")); require (']'); diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index 4a0a48a..908d1a3 100644 --- a/gdb/testsuite/gdb.rust/expr.exp +++ b/gdb/testsuite/gdb.rust/expr.exp @@ -113,6 +113,7 @@ gdb_test "ptype \[1,2,3,4\]" "type = \\\[i32; 4\\\]" gdb_test "print \[mut 1,2,3,4\]" " = \\\[1, 2, 3, 4\\\]" gdb_test "print \[1,2 3" "',' or ']' expected" gdb_test "print \[1 2" "',', ';', or ']' expected" +gdb_test "print \[23\]" " = \\\[23\\\]" gdb_test "print b\"hi rust\"" " = b\"hi rust\"" # This isn't rusty syntax yet, but that's another bug -- this is just |