Remove queued IKEv1 message before processing it

Avoids destruction or processing of a queued message in
recursive process_message() call.
This commit is contained in:
Martin Willi
2012-08-08 14:54:03 +02:00
parent 6204c1182d
commit 4e98ca1800
+5 -3
View File
@@ -962,6 +962,7 @@ static status_t process_response(private_task_manager_t *this,
message_t *message) message_t *message)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
message_t *queued;
status_t status; status_t status;
task_t *task; task_t *task;
@@ -1010,10 +1011,11 @@ static status_t process_response(private_task_manager_t *this,
if (this->queued && this->active_tasks->get_count(this->active_tasks) == 0) if (this->queued && this->active_tasks->get_count(this->active_tasks) == 0)
{ {
status = this->public.task_manager.process_message( queued = this->queued;
&this->public.task_manager, this->queued);
this->queued->destroy(this->queued);
this->queued = NULL; this->queued = NULL;
status = this->public.task_manager.process_message(
&this->public.task_manager, queued);
queued->destroy(queued);
if (status == DESTROY_ME) if (status == DESTROY_ME)
{ {
return status; return status;