Skip to content

Commit e499aa8

Browse files
committed
#124 fix scan-build error
1 parent cbc1ecf commit e499aa8

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

flecs.c

+4
Original file line numberDiff line numberDiff line change
@@ -18805,6 +18805,8 @@ void insert_select_or_with(
1880518805
eval_subject_supersets = true;
1880618806

1880718807
} else if (ecs_id_is_wildcard(term->id)) {
18808+
ecs_assert(subj != NULL, ECS_INTERNAL_ERROR, NULL);
18809+
1880818810
op = insert_operation(rule, -1, written);
1880918811

1881018812
if (!is_known(subj, written)) {
@@ -20155,6 +20157,8 @@ bool eval_superset(
2015520157
return false;
2015620158
}
2015720159

20160+
ecs_assert(table->type != NULL, ECS_INTERNAL_ERROR, NULL);
20161+
2015820162
ecs_entity_t col_entity = rule_get_column(table->type, column);
2015920163
ecs_entity_t col_obj = ecs_entity_t_lo(col_entity);
2016020164

src/addons/rules.c

+4
Original file line numberDiff line numberDiff line change
@@ -2074,6 +2074,8 @@ void insert_select_or_with(
20742074
eval_subject_supersets = true;
20752075

20762076
} else if (ecs_id_is_wildcard(term->id)) {
2077+
ecs_assert(subj != NULL, ECS_INTERNAL_ERROR, NULL);
2078+
20772079
op = insert_operation(rule, -1, written);
20782080

20792081
if (!is_known(subj, written)) {
@@ -3424,6 +3426,8 @@ bool eval_superset(
34243426
return false;
34253427
}
34263428

3429+
ecs_assert(table->type != NULL, ECS_INTERNAL_ERROR, NULL);
3430+
34273431
ecs_entity_t col_entity = rule_get_column(table->type, column);
34283432
ecs_entity_t col_obj = ecs_entity_t_lo(col_entity);
34293433

test/api/project.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,8 @@
16211621
"test_subj_w_pair_wildcard_w_isa_2_lvls",
16221622
"test_this_w_wildcard_w_isa",
16231623
"test_this_w_wildcard_w_isa_2_lvls",
1624-
"test_this_w_wildcard_w_2_isa"
1624+
"test_this_w_wildcard_w_2_isa",
1625+
"test_this_w_wildcard_w_isa_no_owned"
16251626
]
16261627
}, {
16271628
"id": "TransitiveRules",

test/api/src/Rules.c

+4
Original file line numberDiff line numberDiff line change
@@ -6226,3 +6226,7 @@ void Rules_test_this_w_wildcard_w_2_isa() {
62266226

62276227
ecs_fini(world);
62286228
}
6229+
6230+
void Rules_test_this_w_wildcard_w_isa_no_owned() {
6231+
// Implement testcase
6232+
}

test/api/src/main.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,7 @@ void Rules_test_subj_w_pair_wildcard_w_isa_2_lvls(void);
15541554
void Rules_test_this_w_wildcard_w_isa(void);
15551555
void Rules_test_this_w_wildcard_w_isa_2_lvls(void);
15561556
void Rules_test_this_w_wildcard_w_2_isa(void);
1557+
void Rules_test_this_w_wildcard_w_isa_no_owned(void);
15571558

15581559
// Testsuite 'TransitiveRules'
15591560
void TransitiveRules_trans_X_X(void);
@@ -8482,6 +8483,10 @@ bake_test_case Rules_testcases[] = {
84828483
{
84838484
"test_this_w_wildcard_w_2_isa",
84848485
Rules_test_this_w_wildcard_w_2_isa
8486+
},
8487+
{
8488+
"test_this_w_wildcard_w_isa_no_owned",
8489+
Rules_test_this_w_wildcard_w_isa_no_owned
84858490
}
84868491
};
84878492

@@ -12222,7 +12227,7 @@ static bake_test_suite suites[] = {
1222212227
"Rules",
1222312228
NULL,
1222412229
NULL,
12225-
152,
12230+
153,
1222612231
Rules_testcases
1222712232
},
1222812233
{

0 commit comments

Comments
 (0)