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

修复table_info.conf中tableid不连续，导致的部分回调表没有start调用和create_maat_scanner中段错误的bug。

Browse Source
This commit is contained in:
zhengchao
2016-06-23 16:11:23 +08:00
parent 7030a0cdbe
commit ec5d5b171d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/entry/Maat_rule.cpp
View File

@@ -26,7 +26,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_8_20160617_PERF_TEST=1; int MAAT_FRAME_VERSION_1_8_20160623_PERF_TEST=1;
const char *maat_module="MAAT Frame"; const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
@@ -941,8 +941,12 @@ struct _Maat_scanner_t* create_maat_scanner(unsigned int version,_Maat_feather_t
scanner->tomb_ref=tomb; scanner->tomb_ref=tomb;
scanner->region_rslt_buff=(scan_result_t*)malloc(sizeof(scan_result_t)*MAX_SCANNER_HIT_NUM*scan_thread_num); scanner->region_rslt_buff=(scan_result_t*)malloc(sizeof(scan_result_t)*MAX_SCANNER_HIT_NUM*scan_thread_num);
for(i=0;i<table_cnt;i++) for(i=0;i<MAX_TABLE_NUM;i++)
{ {
if(pp_table[i]==NULL)
{
continue;
}
switch(pp_table[i]->table_type) switch(pp_table[i]->table_type)
{ {
case TABLE_TYPE_DIGEST: case TABLE_TYPE_DIGEST:
@@ -2521,7 +2525,7 @@ void maat_start_cb(unsigned int new_version,int update_type,void*u_para)
feather->maat_version,new_version); feather->maat_version,new_version);
feather->maat_version=new_version; feather->maat_version=new_version;
} }
for(i=0;i<feather->table_cnt;i++) for(i=0;i<MAX_TABLE_NUM;i++)
{ {
p_table=feather->p_table_info[i]; p_table=feather->p_table_info[i];
if(p_table==NULL||p_table->table_type!=TABLE_TYPE_PLUGIN) if(p_table==NULL||p_table->table_type!=TABLE_TYPE_PLUGIN)