Check if colliding task has actually a CHILD, i.e. after a migrate

2011-06-03 10:49:54 +02:00
parent ff6aab9e85
commit bc20bc1927
1 changed files with 4 additions and 1 deletions
@@ -252,9 +252,12 @@ 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);
+				if (child_sa)
+				{
 					child_sa->set_close_action(child_sa, ACTION_NONE);
 				}
 			}
+		}
 		else
 		{
 			DBG1(DBG_IKE, "CHILD_SA rekey collision lost, "