From bc20bc192720e4f41979165ff10e1a4880779fb4 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 1 Jun 2011 13:57:29 +0000 Subject: [PATCH] Check if colliding task has actually a CHILD, i.e. after a migrate --- src/libcharon/sa/tasks/child_rekey.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libcharon/sa/tasks/child_rekey.c b/src/libcharon/sa/tasks/child_rekey.c index b39a5fc67..05db057fb 100644 --- a/src/libcharon/sa/tasks/child_rekey.c +++ b/src/libcharon/sa/tasks/child_rekey.c @@ -252,7 +252,10 @@ static child_sa_t *handle_collision(private_child_rekey_t *this) { /* disable close action for the redundand child */ child_sa = other->child_create->get_child(other->child_create); - child_sa->set_close_action(child_sa, ACTION_NONE); + if (child_sa) + { + child_sa->set_close_action(child_sa, ACTION_NONE); + } } } else