From: Martin Willi <martin@revosec.ch>
Date: Tue, 13 Dec 2011 09:35:18 +0000 (+0100)
Subject: Fix IKEv1 DELETE subtask creation and processing
X-Git-Tag: 5.0.0~338^2~9^2~244
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dec456b69af65170c44ecf8c724ea7d62e39d16;p=thirdparty%2Fstrongswan.git

Fix IKEv1 DELETE subtask creation and processing
---

diff --git a/src/libcharon/sa/tasks/informational.c b/src/libcharon/sa/tasks/informational.c
index c1a30e4eef..c2c6aa5fa4 100644
--- a/src/libcharon/sa/tasks/informational.c
+++ b/src/libcharon/sa/tasks/informational.c
@@ -94,15 +94,19 @@ METHOD(task_t, process_r, status_t,
 				}
 				continue;
 			case DELETE_V1:
-				delete = (delete_payload_t*)payload;
-				if (delete->get_protocol_id(delete) == PROTO_IKE)
+				if (!this->del)
 				{
-					this->del = (task_t*)ike_delete_create(this->ike_sa, FALSE);
-				}
-				else
-				{
-					this->del = (task_t*)child_delete_create(this->ike_sa,
-															 PROTO_NONE, 0);
+					delete = (delete_payload_t*)payload;
+					if (delete->get_protocol_id(delete) == PROTO_IKE)
+					{
+						this->del = (task_t*)ike_delete_create(this->ike_sa,
+															   FALSE);
+					}
+					else
+					{
+						this->del = (task_t*)child_delete_create(this->ike_sa,
+																 PROTO_NONE, 0);
+					}
 				}
 				break;
 			default:
@@ -112,7 +116,7 @@ METHOD(task_t, process_r, status_t,
 	}
 	enumerator->destroy(enumerator);
 
-	if (status == SUCCESS)
+	if (this->del && status == SUCCESS)
 	{
 		return this->del->process(this->del, message);
 	}