parser-decl-var: Fix crash after Redim array expression parsing fails

freebasic · Jun 2, 2014 · 12f1e2d · 12f1e2d
1 parent 0d50e8e
commit 12f1e2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/compiler/parser-decl-var.bas b/src/compiler/parser-decl-var.bas
@@ -1025,7 +1025,7 @@ private function hIdxInParensOnlyExpr( ) as ASTNODE ptr
 end function
 
 private function hCheckDynamicArrayExpr( byval varexpr as ASTNODE ptr ) as ASTNODE ptr
-	if( astIsNIDXARRAY( varexpr ) ) then
+	if( varexpr andalso astIsNIDXARRAY( varexpr ) ) then
 		varexpr = astRemoveNIDXARRAY( varexpr )
 
 		if( astIsVAR( varexpr ) or astIsFIELD( varexpr ) ) then

diff --git a/tests/dim/redim-expression-invalid.bas b/tests/dim/redim-expression-invalid.bas
@@ -0,0 +1,7 @@
+' TEST_MODE : COMPILE_ONLY_FAIL
+
+'' It looks like a REDIM with an expression to fbc (since there's a
+'' keyword/identifier that's not followed by a '(' that would indicate the
+'' array dimension list), but the expression parser will fail, since it's an
+'' invalid expression, and the REDIM parser should handle that.
+redim print foo