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

修复MESA_fuzzy中零偏移量区间包含时导致偏移量溢出的bug，更新版本号。

Browse Source
This commit is contained in:
zhengchao
2015-11-19 16:34:40 +08:00
parent b9a5120fc8
commit c1ba19566f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entry/Maat_rule.cpp
View File

@@ -24,7 +24,7 @@
#include "mesa_fuzzy.h"
#include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_3_20151113=0;
int MAAT_FRAME_VERSION_1_3_20151119=0;
const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"};

4
src/entry/mesa_fuzzy.c
View File

@@ -186,7 +186,7 @@ void fuzzy_destroy_handle(fuzzy_handle_t * handle)
*/
unsigned int fuzzy_feed(fuzzy_handle_t * handle, const char * data, unsigned int size, unsigned long long offset)
{
if(data==NULL||size==0)
if(data == NULL || size == 0)
{
return 0;
}
@@ -265,7 +265,7 @@ unsigned int segment_overlap(fuzzy_handle_t * handle, fuzzy_node * fnode, unsign
}
case CONTAIN: //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Dz<EFBFBD><C7B2><EFBFBD>ֱ<EFBFBD>Ӳ<EFBFBD><D3B2>룬Ȼ<EBA3AC><C8BB><EFBFBD>ı<EFBFBD>seg<65><67><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>data<74>ƶ<EFBFBD><C6B6><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>
{
if(overlap_segs[i]->left - 1 >= seg->left)
if(overlap_segs[i]->left >= 1 && overlap_segs[i]->left - 1 >= seg->left)
{
fuzzy_node * node = (fuzzy_node *)calloc(sizeof(fuzzy_node), 1);
memcpy(node, fnode, sizeof(fuzzy_node));