Fix to forbid behavior properties to be used as a value in expressions

4ian · Oct 21, 2024 · 3cf3418 · 3cf3418
1 parent a5d6584
commit 3cf3418
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/Core/GDCore/IDE/Events/ExpressionValidator.cpp b/Core/GDCore/IDE/Events/ExpressionValidator.cpp
@@ -169,12 +169,17 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
  return true; // We found a property, even if the child is not allowed.
  }
 
- const gd::NamedPropertyDescriptor& property = propertiesContainersList.Get(identifier.identifierName).second;
+ const gd::NamedPropertyDescriptor &property =
+ propertiesContainersList.Get(identifier.identifierName).second;
 
  if (property.GetType() == "Number") {
- childType = Type::Number;
+  childType = Type::Number;
  } else if (property.GetType() == "Boolean") {
- // Nothing - we don't know the precise type (this could be used a string or as a number)
+ // Nothing - we don't know the precise type (this could be used a string
+ // or as a number)
+ } else if (property.GetType() == "Behavior") {
+ RaiseTypeError(_("Behaviors can't be used as a value in expressions."),
+ identifier.identifierNameLocation);
  } else {
  // Assume type is String or equivalent.
  childType = Type::String;

diff --git a/Core/tests/ExpressionParser2.cpp b/Core/tests/ExpressionParser2.cpp
@@ -1962,6 +1962,25 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
  }
  }
 
+ SECTION("Invalid property (required behavior)") {
+ {
+ gd::PropertiesContainer propertiesContainer(gd::EventsFunctionsContainer::Extension);
+
+ auto projectScopedContainersWithProperties = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout1);
+ projectScopedContainersWithProperties.AddPropertiesContainer(propertiesContainer);
+
+ propertiesContainer.InsertNew("MyRequiredBehavior").SetType("Behavior");
+
+ auto node =
+ parser.ParseExpression("\"abc\" + MyRequiredBehavior");
+
+ gd::ExpressionValidator validator(platform, projectScopedContainersWithProperties, "number|string");
+ node->Visit(validator);
+ REQUIRE(validator.GetFatalErrors().size() == 1);
+ REQUIRE(validator.GetFatalErrors()[0]->GetMessage() == "Behaviors can't be used as a value in expressions.");
+ }
+ }
+
  SECTION("Invalid property (unsupported child syntax, 1 level)") {
  {
  gd::PropertiesContainer propertiesContainer(gd::EventsFunctionsContainer::Extension);