From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 7 Jun 2012 12:59:20 +0000 (+0200)
Subject: Fix SIGSEGV if kernel install fails during Quick Mode as responder.
X-Git-Tag: 5.0.0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e91157a4b64e752e21fcd4b95f3f56d85eb519cc;p=thirdparty%2Fstrongswan.git

Fix SIGSEGV if kernel install fails during Quick Mode as responder.
---

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 663f2c0632..9251e1a35e 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -964,11 +964,15 @@ METHOD(task_t, process_r, status_t,
 			}
 			if (!install(this))
 			{
-				this->ike_sa->flush_queue(this->ike_sa, TASK_QUEUE_PASSIVE);
-				this->ike_sa->queue_task(this->ike_sa,
-					(task_t*)quick_delete_create(this->ike_sa,
+				ike_sa_t *ike_sa = this->ike_sa;
+				task_t *task;
+
+				task = (task_t*)quick_delete_create(this->ike_sa,
 								this->proposal->get_protocol(this->proposal),
-								this->spi_i, TRUE, TRUE));
+								this->spi_i, TRUE, TRUE);
+				/* flush_queue() destroys the current task */
+				ike_sa->flush_queue(ike_sa, TASK_QUEUE_PASSIVE);
+				ike_sa->queue_task(ike_sa, task);
 				return ALREADY_DONE;
 			}
 			return SUCCESS;