Use enumerator for queued_tasks migration to avoid infinite loop

diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 568f31a3aa54ca7835603db838133b43d8d4ad1e..a688264403756f9ae7ad0eb963e31c29ccf4ef88 100644 (file)
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager.c
@@ -986,6 +986,7 @@ METHOD(task_manager_t, busy, bool,
 METHOD(task_manager_t, reset, void,
        private_task_manager_t *this, u_int32_t initiate, u_int32_t respond)
 {
+       enumerator_t *enumerator;
        task_t *task;
 
        /* reset message counters and retransmit packets */
@@ -1004,12 +1005,13 @@ METHOD(task_manager_t, reset, void,
        this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
 
        /* reset queued tasks */
-       while (this->queued_tasks->remove_last(this->queued_tasks,
-                                                                                  (void**)&task) == SUCCESS)
+       enumerator = this->queued_tasks->create_enumerator(this->queued_tasks);
+       while (enumerator->enumerate(enumerator, &task))
        {
                task->migrate(task, this->ike_sa);
-               this->queued_tasks->insert_first(this->queued_tasks, task);
        }
+       enumerator->destroy(enumerator);
+
        /* reset active tasks */
        while (this->active_tasks->remove_last(this->active_tasks,
                                                                                   (void**)&task) == SUCCESS)