Migrate queued_tasks tasks, to avoid dangling pointers

diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 8857186f920ae2729fbf487a3f54c25fd275c4c0..568f31a3aa54ca7835603db838133b43d8d4ad1e 100644 (file)
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager.c
@@ -1003,6 +1003,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)
+       {
+               task->migrate(task, this->ike_sa);
+               this->queued_tasks->insert_first(this->queued_tasks, task);
+       }
        /* reset active tasks */
        while (this->active_tasks->remove_last(this->active_tasks,
                                                                                   (void**)&task) == SUCCESS)