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/0015-ike-rekey-Fix-cleanup-call.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/0015-ike-rekey-Fix-cleanup-call.patch')
| -rw-r--r-- | main/strongswan/0015-ike-rekey-Fix-cleanup-call.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/main/strongswan/0015-ike-rekey-Fix-cleanup-call.patch b/main/strongswan/0015-ike-rekey-Fix-cleanup-call.patch new file mode 100644 index 0000000000..e17cf30cd9 --- /dev/null +++ b/main/strongswan/0015-ike-rekey-Fix-cleanup-call.patch @@ -0,0 +1,34 @@ +From 81f1aa8dc375a84d9f0dc3e4027f2aebf6d03b18 Mon Sep 17 00:00:00 2001 +From: Tobias Brunner <tobias@strongswan.org> +Date: Mon, 27 Jul 2015 15:20:01 +0200 +Subject: [PATCH] ike-rekey: Fix cleanup() call + +--- + src/libcharon/sa/ikev2/tasks/ike_rekey.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c +index 4133c93..eaba04e 100644 +--- a/src/libcharon/sa/ikev2/tasks/ike_rekey.c ++++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c +@@ -394,7 +394,7 @@ static void cleanup(private_ike_rekey_t *this) + METHOD(task_t, migrate, void, + private_ike_rekey_t *this, ike_sa_t *ike_sa) + { +- cleanup(); ++ cleanup(this); + this->collision = NULL; + this->ike_sa = ike_sa; + this->new_sa = NULL; +@@ -405,7 +405,7 @@ METHOD(task_t, migrate, void, + METHOD(task_t, destroy, void, + private_ike_rekey_t *this) + { +- cleanup(); ++ cleanup(this); + free(this); + } + +-- +2.4.6 + |