From: Martin Willi <martin@revosec.ch>
Date: Tue, 26 Mar 2013 15:19:00 +0000 (+0100)
Subject: controller: clean up job data if a thread gets cancelled waiting in a function
X-Git-Tag: 5.1.0dr1~154^2~13
X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=5e9144a21ff15e38f1a6b89fad4b6b02f443051a;ds=sidebyside

controller: clean up job data if a thread gets cancelled waiting in a function

Controller functions are thread cancellation points, so register a cancellation
handler cleaning up job data.
---

diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
index 0ee99c4..c546da5 100644
--- a/src/libcharon/control/controller.c
+++ b/src/libcharon/control/controller.c
@@ -412,6 +412,7 @@ METHOD(controller_t, initiate, status_t,
 		.refcount = 1,
 	);
 	job->listener.logger.listener = &job->listener;
+	thread_cleanup_push((void*)destroy_job, job);
 
 	if (callback == NULL)
 	{
@@ -425,7 +426,7 @@ METHOD(controller_t, initiate, status_t,
 		}
 	}
 	status = job->listener.status;
-	destroy_job(job);
+	thread_cleanup_pop(TRUE);
 	return status;
 }
 
@@ -500,6 +501,7 @@ METHOD(controller_t, terminate_ike, status_t,
 		.refcount = 1,
 	);
 	job->listener.logger.listener = &job->listener;
+	thread_cleanup_push((void*)destroy_job, job);
 
 	if (callback == NULL)
 	{
@@ -513,7 +515,7 @@ METHOD(controller_t, terminate_ike, status_t,
 		}
 	}
 	status = job->listener.status;
-	destroy_job(job);
+	thread_cleanup_pop(TRUE);
 	return status;
 }
 
@@ -615,6 +617,7 @@ METHOD(controller_t, terminate_child, status_t,
 		.refcount = 1,
 	);
 	job->listener.logger.listener = &job->listener;
+	thread_cleanup_push((void*)destroy_job, job);
 
 	if (callback == NULL)
 	{
@@ -628,7 +631,7 @@ METHOD(controller_t, terminate_child, status_t,
 		}
 	}
 	status = job->listener.status;
-	destroy_job(job);
+	thread_cleanup_pop(TRUE);
 	return status;
 }