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

cm_read_cfg_index_file函数由fscanf改为fgets后，feof行为变化，导致索引文件行数误判的bug。该bug在支持加密时引入。

Browse Source
This commit is contained in:
zhengchao
2017-06-15 17:56:06 +08:00
parent 96910820bb
commit 8c4139c1bd
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entry/Maat_rule.cpp
View File

@@ -28,7 +28,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_9_20170613=1; int MAAT_FRAME_VERSION_1_9_20170615=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",

1
src/entry/config_monitor.cpp
View File

@@ -324,6 +324,7 @@ int cm_read_cfg_index_file(const char* path,struct cm_table_info_t* idx,int size
char line[MAX_CONFIG_LINE]; char line[MAX_CONFIG_LINE];
while(!feof(fp)) while(!feof(fp))
{ {
memset(line,0,sizeof(line));
fgets(line,sizeof(line),fp); fgets(line,sizeof(line),fp);
ret=sscanf(line,"%s\t%d\t%s\t%s",idx[i].table_name ret=sscanf(line,"%s\t%d\t%s\t%s",idx[i].table_name
,&(idx[i].cfg_num) ,&(idx[i].cfg_num)