gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH]fix get_hit_path coredump when half_hit or hit don't happen

Browse Source
This commit is contained in:
liuwentan
2023-06-27 14:25:05 +08:00
parent 6046062032
commit d7c083ae73
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/maat_api.c
View File

@@ -1900,6 +1900,10 @@ int maat_state_get_hit_paths(struct maat_state *state, struct maat_hit_path *pat
return -1; return -1;
} }
if (NULL == state->compile_state) {
return 0;
}
int compile_table_id = table_manager_get_default_compile_table_id(maat_inst->tbl_mgr); int compile_table_id = table_manager_get_default_compile_table_id(maat_inst->tbl_mgr);
if (state->compile_table_id > 0) { if (state->compile_table_id > 0) {
compile_table_id = state->compile_table_id; compile_table_id = state->compile_table_id;
@@ -1929,6 +1933,10 @@ int maat_state_get_hit_groups(struct maat_state *state, struct maat_hit_group *g
return -1; return -1;
} }
if (NULL == state->compile_state) {
return 0;
}
int g2g_table_id = table_manager_get_group2group_table_id(state->maat_inst->tbl_mgr); int g2g_table_id = table_manager_get_group2group_table_id(state->maat_inst->tbl_mgr);
void *g2g_runtime = table_manager_get_runtime(state->maat_inst->tbl_mgr, g2g_table_id); void *g2g_runtime = table_manager_get_runtime(state->maat_inst->tbl_mgr, g2g_table_id);

16
src/maat_table.c
View File

@@ -982,11 +982,19 @@ enum table_type table_manager_get_table_type(struct table_manager *tbl_mgr, int
int table_manager_get_default_compile_table_id(struct table_manager *tbl_mgr) int table_manager_get_default_compile_table_id(struct table_manager *tbl_mgr)
{ {
if (NULL == tbl_mgr) {
return -1;
}
return tbl_mgr->default_compile_table_id; return tbl_mgr->default_compile_table_id;
} }
int table_manager_get_group2group_table_id(struct table_manager *tbl_mgr) int table_manager_get_group2group_table_id(struct table_manager *tbl_mgr)
{ {
if (NULL == tbl_mgr) {
return -1;
}
return tbl_mgr->g2g_table_id; return tbl_mgr->g2g_table_id;
} }
@@ -1018,11 +1026,19 @@ int table_manager_get_valid_column(struct table_manager *tbl_mgr, int table_id)
size_t table_manager_accept_tags_count(struct table_manager *tbl_mgr) size_t table_manager_accept_tags_count(struct table_manager *tbl_mgr)
{ {
if (NULL == tbl_mgr) {
return -1;
}
return tbl_mgr->n_accept_tag; return tbl_mgr->n_accept_tag;
} }
int table_manager_accept_tags_match(struct table_manager *tbl_mgr, const char *tags) int table_manager_accept_tags_match(struct table_manager *tbl_mgr, const char *tags)
{ {
if (NULL == tbl_mgr) {
return -1;
}
return compare_accept_tag(tags, tbl_mgr->accept_tags, tbl_mgr->n_accept_tag); return compare_accept_tag(tags, tbl_mgr->accept_tags, tbl_mgr->n_accept_tag);
} }