#124 fix scan-build error

SanderMertens · Feb 18, 2022 · a2efbef · a2efbef
1 parent cbc1ecf
commit a2efbef
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/flecs.c b/flecs.c
@@ -18805,6 +18805,8 @@ void insert_select_or_with(
             eval_subject_supersets = true;
 
         } else if (ecs_id_is_wildcard(term->id)) {
+            ecs_assert(subj != NULL, ECS_INTERNAL_ERROR, NULL);
+
             op = insert_operation(rule, -1, written);
 
             if (!is_known(subj, written)) {
@@ -20155,6 +20157,8 @@ bool eval_superset(
             return false;
         }
 
+        ecs_assert(table != NULL, ECS_INTERNAL_ERROR, NULL);
+
         ecs_entity_t col_entity = rule_get_column(table->type, column);
         ecs_entity_t col_obj = ecs_entity_t_lo(col_entity);
 

diff --git a/src/addons/rules.c b/src/addons/rules.c
@@ -2074,6 +2074,8 @@ void insert_select_or_with(
             eval_subject_supersets = true;
 
         } else if (ecs_id_is_wildcard(term->id)) {
+            ecs_assert(subj != NULL, ECS_INTERNAL_ERROR, NULL);
+
             op = insert_operation(rule, -1, written);
 
             if (!is_known(subj, written)) {
@@ -3424,6 +3426,8 @@ bool eval_superset(
             return false;
         }
 
+        ecs_assert(table != NULL, ECS_INTERNAL_ERROR, NULL);
+
         ecs_entity_t col_entity = rule_get_column(table->type, column);
         ecs_entity_t col_obj = ecs_entity_t_lo(col_entity);
 

diff --git a/test/api/project.json b/test/api/project.json
@@ -1621,7 +1621,8 @@
                 "test_subj_w_pair_wildcard_w_isa_2_lvls",
                 "test_this_w_wildcard_w_isa",
                 "test_this_w_wildcard_w_isa_2_lvls",
-                "test_this_w_wildcard_w_2_isa"
+                "test_this_w_wildcard_w_2_isa",
+                "test_this_w_wildcard_w_isa_no_owned"
             ]
         }, {
             "id": "TransitiveRules",

diff --git a/test/api/src/Rules.c b/test/api/src/Rules.c
@@ -6226,3 +6226,7 @@ void Rules_test_this_w_wildcard_w_2_isa() {
 
     ecs_fini(world);
 }
+
+void Rules_test_this_w_wildcard_w_isa_no_owned() {
+    // Implement testcase
+}
diff --git a/test/api/src/main.c b/test/api/src/main.c
@@ -1554,6 +1554,7 @@ void Rules_test_subj_w_pair_wildcard_w_isa_2_lvls(void);
 void Rules_test_this_w_wildcard_w_isa(void);
 void Rules_test_this_w_wildcard_w_isa_2_lvls(void);
 void Rules_test_this_w_wildcard_w_2_isa(void);
+void Rules_test_this_w_wildcard_w_isa_no_owned(void);
 
 // Testsuite 'TransitiveRules'
 void TransitiveRules_trans_X_X(void);
@@ -8482,6 +8483,10 @@ bake_test_case Rules_testcases[] = {
     {
         "test_this_w_wildcard_w_2_isa",
         Rules_test_this_w_wildcard_w_2_isa
+    },
+    {
+        "test_this_w_wildcard_w_isa_no_owned",
+        Rules_test_this_w_wildcard_w_isa_no_owned
     }
 };
 
@@ -12222,7 +12227,7 @@ static bake_test_suite suites[] = {
         "Rules",
         NULL,
         NULL,
-        152,
+        153,
         Rules_testcases
     },
     {