From 87c84f07a0a1b7e12b6a0c9b21cc0e021e460786 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Mon, 1 May 2023 10:10:29 -0600
Subject: [PATCH] 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
---
 gdb/rust-parse.c                | 4 ++--
 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 6c7922de9c7..648e48dda40 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 4a0a48ade62..908d1a3680b 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
-- 
2.30.2