Fix hang on unterminated property decls.

Bug: issue #1002 Test: new test case
alliedmodders · Nov 29, 2024 · d23897e · d23897e
1 parent 329bf95
commit d23897e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/compiler/parser.cpp b/compiler/parser.cpp
@@ -1962,11 +1962,18 @@ Parser::parse_methodmap_property(MethodmapDecl* map)
     if (!lexer_->need('{'))
         return nullptr;
 
+    AutoCountErrors errors;
+
     MemberFunctionDecl* getter = nullptr;
     MemberFunctionDecl* setter = nullptr;
     while (!lexer_->match('}')) {
         if (!parse_methodmap_property_accessor(map, ident, type, &getter, &setter))
             lexer_->lexclr(TRUE);
+        if (!lexer_->freading()) {
+            if (errors.ok())
+                lexer_->need('}');
+            break;
+        }
     }
 
     lexer_->require_newline(TerminatorPolicy::Newline);

diff --git a/tests/compile-only/fail-incomplete-property-block.sp b/tests/compile-only/fail-incomplete-property-block.sp
@@ -0,0 +1,2 @@
+methodmap A {
+        property int p {
diff --git a/tests/compile-only/fail-incomplete-property-block.txt b/tests/compile-only/fail-incomplete-property-block.txt
@@ -0,0 +1 @@
+(3) : error 001: expected token: "public", but found "-end of file-"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(3) : error 001: expected token: "public", but found "-end of file-"