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

Maat Command修复Bug：下发IP规则存在double free的bug，同时redis链接时操作了错误的ctx。

Browse Source
This commit is contained in:
zhengchao
2017-09-18 20:15:59 +08:00
parent c1fbb6f7be
commit b3d1e45c34
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entry/Maat_command.cpp
View File

@@ -78,7 +78,7 @@ int connect_redis_for_write(_Maat_feather_t * feather)
} }
else else
{ {
reply=_wrap_redisCommand(feather->redis_read_ctx, "select %d",feather->redis_index); reply=_wrap_redisCommand(feather->redis_write_ctx, "select %d",feather->redis_index);
freeReplyObject(reply); freeReplyObject(reply);
} }
return ret; return ret;
@@ -1088,7 +1088,7 @@ void _maat_copy_region(struct Maat_region_t* dst,const struct Maat_region_t* src
dst->ip_rule.src_ip=_maat_strdup(src->ip_rule.src_ip); dst->ip_rule.src_ip=_maat_strdup(src->ip_rule.src_ip);
dst->ip_rule.mask_src_ip=_maat_strdup(src->ip_rule.mask_src_ip); dst->ip_rule.mask_src_ip=_maat_strdup(src->ip_rule.mask_src_ip);
dst->ip_rule.dst_ip=_maat_strdup(src->ip_rule.dst_ip); dst->ip_rule.dst_ip=_maat_strdup(src->ip_rule.dst_ip);
dst->ip_rule.mask_src_ip=_maat_strdup(src->ip_rule.mask_src_ip); dst->ip_rule.mask_dst_ip=_maat_strdup(src->ip_rule.mask_dst_ip);
break; break;
case REGION_EXPR: case REGION_EXPR:
dst->expr_rule.keywords=_maat_strdup(src->expr_rule.keywords); dst->expr_rule.keywords=_maat_strdup(src->expr_rule.keywords);
@@ -1117,7 +1117,7 @@ void _maat_empty_region(struct Maat_region_t* p)
free((char*)p->ip_rule.src_ip); free((char*)p->ip_rule.src_ip);
free((char*)p->ip_rule.mask_src_ip); free((char*)p->ip_rule.mask_src_ip);
free((char*)p->ip_rule.dst_ip); free((char*)p->ip_rule.dst_ip);
free((char*)p->ip_rule.mask_src_ip); free((char*)p->ip_rule.mask_dst_ip);
break; break;
case REGION_EXPR: case REGION_EXPR:
free((char*)p->expr_rule.keywords); free((char*)p->expr_rule.keywords);

2
src/entry/Maat_rule.cpp
View File

@@ -30,7 +30,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_0_20170916=1; int MAAT_FRAME_VERSION_2_0_20170918=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",""};