denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a memory leak in imc|imv_agent

Browse Source
This commit is contained in:
Andreas Steffen
2012-07-12 00:03:24 +02:00
parent 246c9ad831
commit 3f6392bc14
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/imc/imc_agent.c
+10 -7
View File
@@ -456,6 +456,7 @@ METHOD(imc_agent_t, send_message, TNC_Result,
{ {
TNC_MessageType type; TNC_MessageType type;
TNC_UInt32 msg_flags; TNC_UInt32 msg_flags;
TNC_Result result = TNC_RESULT_FATAL;
imc_state_t *state; imc_state_t *state;
pa_tnc_attr_t *attr; pa_tnc_attr_t *attr;
pa_tnc_msg_t *pa_tnc_msg; pa_tnc_msg_t *pa_tnc_msg;
@@ -486,18 +487,20 @@ METHOD(imc_agent_t, send_message, TNC_Result,
} }
msg_flags = excl ? TNC_MESSAGE_FLAGS_EXCLUSIVE : 0; msg_flags = excl ? TNC_MESSAGE_FLAGS_EXCLUSIVE : 0;
return this->send_message_long(src_imc_id, connection_id, msg_flags, result = this->send_message_long(src_imc_id, connection_id, msg_flags,
msg.ptr, msg.len, this->vendor_id, msg.ptr, msg.len, this->vendor_id,
this->subtype, dst_imv_id); this->subtype, dst_imv_id);
} }
if (this->send_message) else if (this->send_message)
{ {
type = (this->vendor_id << 8) | this->subtype; type = (this->vendor_id << 8) | this->subtype;
return this->send_message(this->id, connection_id, msg.ptr, msg.len, result = this->send_message(this->id, connection_id, msg.ptr, msg.len,
type); type);
} }
return TNC_RESULT_FATAL; pa_tnc_msg->destroy(pa_tnc_msg);
return result;
} }
METHOD(imc_agent_t, receive_message, TNC_Result, METHOD(imc_agent_t, receive_message, TNC_Result,
src/libimcv/imv/imv_agent.c
+10 -7
View File
@@ -471,6 +471,7 @@ METHOD(imv_agent_t, send_message, TNC_Result,
private_imv_agent_t *this, TNC_ConnectionID connection_id, bool excl, private_imv_agent_t *this, TNC_ConnectionID connection_id, bool excl,
TNC_UInt32 src_imv_id, TNC_UInt32 dst_imc_id, linked_list_t *attr_list) TNC_UInt32 src_imv_id, TNC_UInt32 dst_imc_id, linked_list_t *attr_list)
{ {
TNC_Result result = TNC_RESULT_FATAL;
TNC_MessageType type; TNC_MessageType type;
TNC_UInt32 msg_flags; TNC_UInt32 msg_flags;
imv_state_t *state; imv_state_t *state;
@@ -503,18 +504,20 @@ METHOD(imv_agent_t, send_message, TNC_Result,
} }
msg_flags = excl ? TNC_MESSAGE_FLAGS_EXCLUSIVE : 0; msg_flags = excl ? TNC_MESSAGE_FLAGS_EXCLUSIVE : 0;
return this->send_message_long(src_imv_id, connection_id, msg_flags, result = this->send_message_long(src_imv_id, connection_id, msg_flags,
msg.ptr, msg.len, this->vendor_id, msg.ptr, msg.len, this->vendor_id,
this->subtype, dst_imc_id); this->subtype, dst_imc_id);
} }
if (this->send_message) else if (this->send_message)
{ {
type = (this->vendor_id << 8) | this->subtype; type = (this->vendor_id << 8) | this->subtype;
return this->send_message(this->id, connection_id, msg.ptr, msg.len, result = this->send_message(this->id, connection_id, msg.ptr, msg.len,
type); type);
} }
return TNC_RESULT_FATAL; pa_tnc_msg->destroy(pa_tnc_msg);
return result;
} }
METHOD(imv_agent_t, set_recommendation, TNC_Result, METHOD(imv_agent_t, set_recommendation, TNC_Result,