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

扫描拦截排除功能导致内存泄漏；dictator_malloc函数使用参数不正确

Browse Source
This commit is contained in:
liuxueli
2020-10-15 14:16:55 +08:00
parent 78b2c7e3ed
commit 899ae69a4b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tsg_entry.cpp
View File

@@ -441,6 +441,12 @@ static struct Maat_rule_t *tsg_policy_decision_criteria(struct streaminfo *a_str
&mid, &mid,
thread_seq); thread_seq);
if(mid!=NULL)
{
Maat_clean_status(&mid);
mid=NULL;
}
if(ret>0) if(ret>0)
{ {
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
@@ -667,7 +673,7 @@ extern "C" char TSG_MASTER_TCP_ENTRY(struct streaminfo *a_tcp, void **pme, int t
case OP_STATE_PENDING: case OP_STATE_PENDING:
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_TCP_LINKS], 0, FS_OP_ADD, 1); FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_TCP_LINKS], 0, FS_OP_ADD, 1);
internal_label=(struct _session_attribute_label_t *)dictator_malloc(1, sizeof(struct _session_attribute_label_t)); internal_label=(struct _session_attribute_label_t *)dictator_malloc(thread_seq, sizeof(struct _session_attribute_label_t));
memset(internal_label, 0, sizeof(struct _session_attribute_label_t)); memset(internal_label, 0, sizeof(struct _session_attribute_label_t));
memset(&identify_info, 0, sizeof(identify_info)); memset(&identify_info, 0, sizeof(identify_info));
@@ -927,7 +933,7 @@ extern "C" char TSG_MASTER_UDP_ENTRY(struct streaminfo *a_udp, void **pme, int t
memset(&identify_info, 0, sizeof(identify_info)); memset(&identify_info, 0, sizeof(identify_info));
identify_application_protocol(a_udp, &identify_info, NULL, a_packet); identify_application_protocol(a_udp, &identify_info, NULL, a_packet);
internal_label=(struct _session_attribute_label_t *)dictator_malloc(1, sizeof(struct _session_attribute_label_t)); internal_label=(struct _session_attribute_label_t *)dictator_malloc(thread_seq, sizeof(struct _session_attribute_label_t));
memset(internal_label, 0, sizeof(struct _session_attribute_label_t)); memset(internal_label, 0, sizeof(struct _session_attribute_label_t));
internal_label->proto=identify_info.proto; internal_label->proto=identify_info.proto;

6
src/tsg_rule.cpp
View File

@@ -147,11 +147,17 @@ static int get_data_center(char *accept_tag, char *data_center, int data_center_
len=strlen(v_item->valuestring); len=strlen(v_item->valuestring);
memcpy(data_center, v_item->valuestring, (len>data_center_len-1 ? data_center_len-1 : len)); memcpy(data_center, v_item->valuestring, (len>data_center_len-1 ? data_center_len-1 : len));
} }
cJSON_Delete(object);
object=NULL;
return 1; return 1;
} }
} }
} }
} }
cJSON_Delete(object);
object=NULL;
} }
return 0; return 0;