From ea71a08e6a2b0c5b0005c1ccc4b50ac7616ef3ff Mon Sep 17 00:00:00 2001 From: zhengchao Date: Thu, 29 Nov 2018 17:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96=E5=A4=96?= =?UTF-8?q?=E9=94=AE=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E4=BD=BF=E7=94=A8=E4=BA=86=E5=BE=AA=E7=8E=AF=E5=8F=98?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=9A=84=E5=86=85=E5=AD=98?= =?UTF-8?q?=E8=AF=BB=E8=B6=8A=E7=95=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_command.cpp | 4 ++-- src/entry/Maat_rule.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index 1438527..5c3335e 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -1540,7 +1540,7 @@ void _get_foregin_keys(struct serial_rule_t* p_rule, int* foreign_columns, int n int foreign_key_size=0; struct stat file_info; 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; itable_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; jn_foreign; j++) { - if(p->f_keys[i].is_existed==1) + if(p->f_keys[j].is_existed==1) { continue; } diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index dd8d0cf..fc19f51 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -32,7 +32,7 @@ #include "stream_fuzzy_hash.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", "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};