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

Maat_hierarchy_compile_mid_update_by_compile中的assert并不准确：在扫描命中region后，进行region_compile之前,该region被删除时，此region不会加入hit_path。

Browse Source
This commit is contained in:
zhengchao
2021-01-29 21:06:32 +08:00
parent 653727e19a
commit e12bef3033
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/entry/Maat_hierarchy.cpp
View File

@@ -1268,7 +1268,7 @@ void Maat_hierarchy_compile_mid_udpate(struct Maat_hierarchy_compile_mid* mid, i
static size_t Maat_hierarchy_compile_mid_update_by_compile(struct Maat_hierarchy_compile_mid* mid, struct Maat_hierarchy_compile* compile) static size_t Maat_hierarchy_compile_mid_update_by_compile(struct Maat_hierarchy_compile_mid* mid, struct Maat_hierarchy_compile* compile)
{ {
size_t r_in_c_cnt=0, this_scan_hit_region_cnt=0; size_t r_in_c_cnt=0;
struct Maat_hierarchy_hit_path* p=NULL, *q=NULL; struct Maat_hierarchy_hit_path* p=NULL, *q=NULL;
struct Maat_hierarchy_literal_id literal_id={0, 0}; struct Maat_hierarchy_literal_id literal_id={0, 0};
struct Maat_hit_path_t condition; struct Maat_hit_path_t condition;
@@ -1281,10 +1281,6 @@ static size_t Maat_hierarchy_compile_mid_update_by_compile(struct Maat_hierarchy
TAILQ_FOREACH(p, &mid->hit_path_qhead, entries) TAILQ_FOREACH(p, &mid->hit_path_qhead, entries)
{ {
n_exsited_path=0; n_exsited_path=0;
if(p->path.Nth_scan==mid->Nth_scan)
{
this_scan_hit_region_cnt++;
}
if(p->path.compile_id==compile->compile_id) if(p->path.compile_id==compile->compile_id)
{ {
continue; continue;
@@ -1321,7 +1317,6 @@ static size_t Maat_hierarchy_compile_mid_update_by_compile(struct Maat_hierarchy
} }
} }
assert(this_scan_hit_region_cnt>=mid->this_scan_region_hit_cnt);
p = TAILQ_FIRST(&new_path_qhead); p = TAILQ_FIRST(&new_path_qhead);
while(p != NULL) while(p != NULL)

2
src/entry/Maat_rule.cpp
View File

@@ -56,7 +56,7 @@ extern "C"
} }
#endif #endif
int MAAT_FRAME_VERSION_3_1_5_20201216=1; int MAAT_FRAME_VERSION_3_1_5_20210129=1;
int is_valid_table_name(const char* str) int is_valid_table_name(const char* str)
{ {