summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_parser.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-09-15 17:20:52 +0200
committerGitHub <noreply@github.com>2021-09-15 17:20:52 +0200
commita4187c923507a3470947bec95657f6b390f7aa95 (patch)
tree654ff24a94958b1fe912d8589c885ffad2e2f9f1 /modules/gdscript/gdscript_parser.cpp
parented11d03b56d14f2868eaae041a42d1c4d4d425c1 (diff)
parent107af38fd185eb6cecd1bf889ccd437cf7a87046 (diff)
downloadredot-engine-a4187c923507a3470947bec95657f6b390f7aa95.tar.gz
Merge pull request #52706 from vnen/gdscript-ternary-operator-crash
GDScript: Show error when missing expression after ternary else
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
-rw-r--r--modules/gdscript/gdscript_parser.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index c9ac055392..d555be1e8d 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -2287,6 +2287,10 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_ternary_operator(Expressio
operation->false_expr = parse_precedence(PREC_TERNARY, false);
+ if (operation->false_expr == nullptr) {
+ push_error(R"(Expected expression after "else".)");
+ }
+
return operation;
}