Fix spcomp assertion on malformed if (#297)

alliedmodders · Dec 20, 2018 · d890d13 · d890d13
1 parent cf511f1
commit d890d13
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/compiler/expressions.cpp b/compiler/expressions.cpp
@@ -1054,7 +1054,8 @@ SC3ExpressionParser::hier14(value *lval1)
     /* array assignment is permitted too (with restrictions) */
     if (oper)
       return error(23); /* array assignment must be simple assigment */
-    assert(lval1->sym!=NULL);
+    if (!lval1->sym)
+      return error(142);
     if (array_totalsize(lval1->sym)==0)
       return error(46,lval1->sym->name());        /* unknown array size */
     lvalue=TRUE;

diff --git a/compiler/messages.h b/compiler/messages.h
@@ -166,7 +166,7 @@ static const char *errmsg[] = {
 /*139*/  "could not find type \"%s\"\n",
 /*140*/  "new-style array types cannot specify dimension sizes as part of their type\n",
 /*141*/  "natives, forwards, and public functions cannot return arrays\n",
-/*142*/  "unused142\n",
+/*142*/  "unexpected array expression\n",
 /*143*/  "new-style declarations should not have \"new\"\n",
 /*144*/  "void cannot be used as a variable type\n",
 /*145*/  "invalid type expression\n",

diff --git a/tests/compile-only/fail-broken-if-conditional.sp b/tests/compile-only/fail-broken-if-conditional.sp
@@ -0,0 +1,6 @@
+int main() {
+  if (
+  {
+    int b = c();
+  }
+}
diff --git a/tests/compile-only/fail-broken-if-conditional.txt b/tests/compile-only/fail-broken-if-conditional.txt
@@ -0,0 +1 @@
+(6) : error 054: unmatched closing brace ("}")