From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 11 Jul 2012 22:03:24 +0000 (+0200)
Subject: fixed a memory leak in imc|imv_agent
X-Git-Tag: 5.0.1~412
X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=3f6392bc1467777acca138da923eb9ce60204a1e

fixed a memory leak in imc|imv_agent
---

diff --git a/src/libimcv/imc/imc_agent.c b/src/libimcv/imc/imc_agent.c
index 4f9bb03..fcf8dac 100644
--- a/src/libimcv/imc/imc_agent.c
+++ b/src/libimcv/imc/imc_agent.c
@@ -456,6 +456,7 @@ METHOD(imc_agent_t, send_message, TNC_Result,
 {
 	TNC_MessageType type;
 	TNC_UInt32 msg_flags;
+	TNC_Result result = TNC_RESULT_FATAL;
 	imc_state_t *state;
 	pa_tnc_attr_t *attr;
 	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;
 
-		return this->send_message_long(src_imc_id, connection_id, msg_flags,
-									   msg.ptr, msg.len, this->vendor_id,
-									   this->subtype, dst_imv_id);
+		result = this->send_message_long(src_imc_id, connection_id, msg_flags,
+										 msg.ptr, msg.len, this->vendor_id,
+										 this->subtype, dst_imv_id);
 	}
-	if (this->send_message)
+	else if (this->send_message)
 	{
 		type = (this->vendor_id << 8) | this->subtype;
 
-		return this->send_message(this->id, connection_id, msg.ptr, msg.len,
-								  type);
+		result = this->send_message(this->id, connection_id, msg.ptr, msg.len,
+									type);
 	}
-	return TNC_RESULT_FATAL;
+	pa_tnc_msg->destroy(pa_tnc_msg);
+
+	return result;
 }
 
 METHOD(imc_agent_t, receive_message, TNC_Result,
diff --git a/src/libimcv/imv/imv_agent.c b/src/libimcv/imv/imv_agent.c
index 888f01c..b67dcad 100644
--- a/src/libimcv/imv/imv_agent.c
+++ b/src/libimcv/imv/imv_agent.c
@@ -471,6 +471,7 @@ METHOD(imv_agent_t, send_message, TNC_Result,
 	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_Result result = TNC_RESULT_FATAL;
 	TNC_MessageType type;
 	TNC_UInt32 msg_flags;
 	imv_state_t *state;
@@ -503,18 +504,20 @@ METHOD(imv_agent_t, send_message, TNC_Result,
 		}
 		msg_flags = excl ? TNC_MESSAGE_FLAGS_EXCLUSIVE : 0;
 
-		return this->send_message_long(src_imv_id, connection_id, msg_flags,
-									   msg.ptr, msg.len, this->vendor_id,
-									   this->subtype, dst_imc_id);
+		result = this->send_message_long(src_imv_id, connection_id, msg_flags,
+										 msg.ptr, msg.len, this->vendor_id,
+										 this->subtype, dst_imc_id);
 	}
-	if (this->send_message)
+	else if (this->send_message)
 	{
 		type = (this->vendor_id << 8) | this->subtype;
 
-		return this->send_message(this->id, connection_id, msg.ptr, msg.len,
-								  type);
+		result = this->send_message(this->id, connection_id, msg.ptr, msg.len,
+									type);
 	}
-	return TNC_RESULT_FATAL;
+	pa_tnc_msg->destroy(pa_tnc_msg);
+
+	return result;
 }
 
 METHOD(imv_agent_t, set_recommendation, TNC_Result,