diff options
| author | Marc Poulhiès <dkm@kataplop.net> | 2022-10-07 18:48:36 +0200 |
|---|---|---|
| committer | Marc Poulhiès <dkm@kataplop.net> | 2022-10-08 10:08:20 +0200 |
| commit | d4c07a9b47c7063a4e79b6b45edccd0e79249605 (patch) | |
| tree | 945d1ce4d8a45e0ec32912c8b23883cc02ebb578 | |
| parent | 06fe912b70bc21dd11e7279e29200431a5b50aa2 (diff) | |
| download | gcc-d4c07a9b47c7063a4e79b6b45edccd0e79249605.zip gcc-d4c07a9b47c7063a4e79b6b45edccd0e79249605.tar.gz gcc-d4c07a9b47c7063a4e79b6b45edccd0e79249605.tar.bz2 | |
fix ICE on missing closing paren
Fix crash (segfault) on a missing closing parenthesis when parsing the
expressions in a block. The returned `expr` was missing a check before being
used.
Add corresponding test.
Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 15 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/missing_closing_paren.rs | 3 |
2 files changed, 14 insertions, 4 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index c4cfbe2..4ebdcf0 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -11728,10 +11728,17 @@ Parser<ManagedTokenSource>::parse_stmt_or_expr_without_block () // must be expression statement lexer.skip_token (); - std::unique_ptr<AST::ExprStmtWithoutBlock> stmt ( - new AST::ExprStmtWithoutBlock (std::move (expr), - t->get_locus ())); - return ExprOrStmt (std::move (stmt)); + if (expr) + { + std::unique_ptr<AST::ExprStmtWithoutBlock> stmt ( + new AST::ExprStmtWithoutBlock (std::move (expr), + t->get_locus ())); + return ExprOrStmt (std::move (stmt)); + } + else + { + return ExprOrStmt::create_error (); + } } // return expression diff --git a/gcc/testsuite/rust/compile/missing_closing_paren.rs b/gcc/testsuite/rust/compile/missing_closing_paren.rs new file mode 100644 index 0000000..895c313 --- /dev/null +++ b/gcc/testsuite/rust/compile/missing_closing_paren.rs @@ -0,0 +1,3 @@ +fn foo() { + (""; // { dg-error "unexpected token .*" } +} |