diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-07-28 11:33:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-07-28 11:35:47 +0300 |
| commit | fc1ceeb02b3e149645205e67bcc009e742140590 (patch) | |
| tree | b559837b40485a7c0f77ce6459c03f131191283d /main/strongswan/0016-ike-Fix-memory-leak-if-remote-address-is-kept.patch | |
| parent | c3aa1460dbeb4e1e10972fc00314d7a80413707e (diff) | |
| download | aports-fc1ceeb02b3e149645205e67bcc009e742140590.tar.bz2 aports-fc1ceeb02b3e149645205e67bcc009e742140590.tar.xz | |
main/strongswan: cherry-pick upstream fixes
also fixes a minor memory leak in patch 1001 (the offending hunk is
now just deleted, as other upstream commits fixed the issue it tried
to address)
Diffstat (limited to 'main/strongswan/0016-ike-Fix-memory-leak-if-remote-address-is-kept.patch')
| -rw-r--r-- | main/strongswan/0016-ike-Fix-memory-leak-if-remote-address-is-kept.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/main/strongswan/0016-ike-Fix-memory-leak-if-remote-address-is-kept.patch b/main/strongswan/0016-ike-Fix-memory-leak-if-remote-address-is-kept.patch new file mode 100644 index 0000000000..3b773d02aa --- /dev/null +++ b/main/strongswan/0016-ike-Fix-memory-leak-if-remote-address-is-kept.patch @@ -0,0 +1,27 @@ +From faebdeac8eafad7b5c2109d5a9ce0af41dbf315c Mon Sep 17 00:00:00 2001 +From: Tobias Brunner <tobias@strongswan.org> +Date: Mon, 27 Jul 2015 19:37:41 +0200 +Subject: [PATCH] ike: Fix memory leak if remote address is kept + +--- + src/libcharon/sa/ike_sa.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c +index 752a756..6ffbd55 100644 +--- a/src/libcharon/sa/ike_sa.c ++++ b/src/libcharon/sa/ike_sa.c +@@ -1230,6 +1230,10 @@ static void resolve_hosts(private_ike_sa_t *this) + * address family might have changed */ + set_other_host(this, host); + } ++ else ++ { ++ host->destroy(host); ++ } + } + + if (this->local_host) +-- +2.4.6 + |