Fix crash when trying to assign entity that's not a component in with…

… statement
SanderMertens · Sep 22, 2023 · 5c29f9d · 5c29f9d
1 parent 819953c
commit 5c29f9d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/flecs.c b/flecs.c
@@ -32122,7 +32122,7 @@ const char* plecs_parse_assign_with_stmt(
 
     ecs_id_t id = state->with[with_frame];
     ecs_id_record_t *idr = flecs_id_record_get(world, id);
-    const ecs_type_info_t *ti = idr->type_info;
+    const ecs_type_info_t *ti = idr ? idr->type_info : NULL;
     if (!ti) {
         char *typename = ecs_id_str(world, id);
         ecs_parser_error(name, expr, ptr - expr, 

diff --git a/src/addons/plecs.c b/src/addons/plecs.c
@@ -1061,7 +1061,7 @@ const char* plecs_parse_assign_with_stmt(
 
     ecs_id_t id = state->with[with_frame];
     ecs_id_record_t *idr = flecs_id_record_get(world, id);
-    const ecs_type_info_t *ti = idr->type_info;
+    const ecs_type_info_t *ti = idr ? idr->type_info : NULL;
     if (!ti) {
         char *typename = ecs_id_str(world, id);
         ecs_parser_error(name, expr, ptr - expr, 

diff --git a/test/addons/project.json b/test/addons/project.json
@@ -469,7 +469,8 @@
                 "scope_w_auto_override_pair",
                 "pair_w_rel_var",
                 "pair_w_tgt_var",
-                "assembly_w_pair_w_this_var"
+                "assembly_w_pair_w_this_var",
+                "with_value_not_a_component"
             ]
         }, {
             "id": "Doc",

diff --git a/test/addons/src/Plecs.c b/test/addons/src/Plecs.c
@@ -7537,3 +7537,18 @@ void Plecs_assembly_w_pair_w_this_var(void) {
 
     ecs_fini(world);
 }
+
+void Plecs_with_value_not_a_component(void) {
+    ecs_world_t *world = ecs_init();
+
+    const char *expr =
+    LINE "with Foo{10} {\n"
+    LINE "  Bar\n"
+    LINE "}\n"
+    LINE "\n";
+
+    ecs_log_set_level(-4);
+    test_assert(ecs_plecs_from_str(world, NULL, expr) != 0);
+
+    ecs_fini(world);
+}
diff --git a/test/addons/src/main.c b/test/addons/src/main.c
@@ -463,6 +463,7 @@ void Plecs_scope_w_auto_override_pair(void);
 void Plecs_pair_w_rel_var(void);
 void Plecs_pair_w_tgt_var(void);
 void Plecs_assembly_w_pair_w_this_var(void);
+void Plecs_with_value_not_a_component(void);
 
 // Testsuite 'Doc'
 void Doc_get_set_name(void);
@@ -3351,6 +3352,10 @@ bake_test_case Plecs_testcases[] = {
     {
         "assembly_w_pair_w_this_var",
         Plecs_assembly_w_pair_w_this_var
+    },
+    {
+        "with_value_not_a_component",
+        Plecs_with_value_not_a_component
     }
 };
 
@@ -7473,7 +7478,7 @@ static bake_test_suite suites[] = {
         "Plecs",
         NULL,
         NULL,
-        227,
+        228,
         Plecs_testcases
     },
     {