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

在判断是否返回命中位置时，修复对rulescan扫描类型判断错误的bug。

Browse Source
This commit is contained in:
zhengchao
2016-04-25 11:59:54 +08:00
parent 89d1b2e74f
commit aa7a3caa51
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entry/Maat_api.cpp
View File

@@ -794,7 +794,7 @@ int Maat_full_scan_string_detail(Maat_feather_t feather,int table_id
region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag), region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag),
hit_region_cnt, hit_region_cnt,
result,compile_result,rule_num); result,compile_result,rule_num);
if(hit_detail!=NULL||_feather->rule_scan_type==0) if(hit_detail!=NULL&&_feather->rule_scan_type!=0)
{ {
*detail_ret=fill_region_hit_detail(data,_mid->inner, *detail_ret=fill_region_hit_detail(data,_mid->inner,
region_result,hit_region_cnt, region_result,hit_region_cnt,
@@ -1193,7 +1193,7 @@ int Maat_stream_scan_string_detail(stream_para_t* stream_para
region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag), region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag),
hit_region_cnt, hit_region_cnt,
result,compile_result,rule_num); result,compile_result,rule_num);
if(hit_detail!=NULL||sp->feather->rule_scan_type==0) if(hit_detail!=NULL&&sp->feather->rule_scan_type!=0)
{ {
if(sp->scan_buff!=NULL) if(sp->scan_buff!=NULL)
{ {

2
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_7_20160406=1; int MAAT_FRAME_VERSION_1_7_20160425=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",