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

修复读取外键内容时，错误的使用了循环变量，导致的内存读越界。

Browse Source
This commit is contained in:
zhengchao
2018-11-29 17:28:26 +08:00
parent f9ff39d993
commit ea71a08e6a
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_command.cpp
View File

@@ -1540,7 +1540,7 @@ void _get_foregin_keys(struct serial_rule_t* p_rule, int* foreign_columns, int n
int foreign_key_size=0; int foreign_key_size=0;
struct stat file_info; struct stat file_info;
p_rule->n_foreign=n_foreign; p_rule->n_foreign=n_foreign;
p_rule->f_keys=(struct foreign_key*)calloc(sizeof(struct foreign_key),n_foreign); p_rule->f_keys=ALLOC(struct foreign_key, n_foreign);
for(i=0; i<n_foreign; i++) for(i=0; i<n_foreign; i++)
{ {
p_foreign=find_Nth_column(p_rule->table_line, foreign_columns[i], &foreign_key_size); p_foreign=find_Nth_column(p_rule->table_line, foreign_columns[i], &foreign_key_size);
@@ -1665,7 +1665,7 @@ void _get_foreign_conts(redisContext *ctx, struct serial_rule_t* rule_list, int
} }
for(j=0; j<p->n_foreign; j++) for(j=0; j<p->n_foreign; j++)
{ {
if(p->f_keys[i].is_existed==1) if(p->f_keys[j].is_existed==1)
{ {
continue; continue;
} }

2
src/entry/Maat_rule.cpp
View File

@@ -32,7 +32,7 @@
#include "stream_fuzzy_hash.h" #include "stream_fuzzy_hash.h"
#include "gram_index_engine.h" #include "gram_index_engine.h"
int MAAT_FRAME_VERSION_2_4_20181127=1; int MAAT_FRAME_VERSION_2_4_20181129=1;
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};