From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 10 Nov 2015 13:00:11 +0000 (+0100)
Subject: trap-manager: Also clean up remote address in error cases
X-Git-Tag: 5.3.4dr3~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8f2c13f9a80c53f4fae15119c5d2cdafb08726b;p=thirdparty%2Fstrongswan.git

trap-manager: Also clean up remote address in error cases

Fixes #1201.
---

diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
index 63505c9603..90ad7e40e7 100644
--- a/src/libcharon/sa/trap_manager.c
+++ b/src/libcharon/sa/trap_manager.c
@@ -211,6 +211,7 @@ METHOD(trap_manager_t, install, u_int32_t,
 	if (this->installing == INSTALL_DISABLED)
 	{	/* flush() has been called */
 		this->lock->unlock(this->lock);
+		other->destroy(other);
 		me->destroy(me);
 		return 0;
 	}
@@ -235,6 +236,7 @@ METHOD(trap_manager_t, install, u_int32_t,
 		{
 			DBG1(DBG_CFG, "CHILD_SA '%s' is already being routed", found->name);
 			this->lock->unlock(this->lock);
+			other->destroy(other);
 			me->destroy(me);
 			return 0;
 		}