Merge pull request #55214 from Scony/fix-gdscript-crash-2

Fix GDScript parser crash on 'dollar mixed with assignment' expression
2022-01-22 20:30:54 +01:00
parent 9b9440165b 1a15a3adf6
commit 182a36db47
3 changed files with 7 additions and 0 deletions
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@ -2415,6 +2415,9 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_assignment(ExpressionNode
 		push_error("Assignment is not allowed inside an expression.");
 		return parse_expression(false); // Return the following expression.
 	}
+	if (p_previous_operand == nullptr) {
+		return parse_expression(false); // Return the following expression.
+	}

 #ifdef DEBUG_ENABLED
 	VariableNode *source_variable = nullptr;