Neither rekey nor del can be NULL.

This commit is contained in:
Tobias Brunner 2011-04-14 13:19:09 +02:00
parent cc2429d9a2
commit 3c0c321776
1 changed files with 2 additions and 2 deletions

View File

@ -382,7 +382,7 @@ static void collide(private_child_rekey_t *this, task_t *other)
if (other->get_type(other) == CHILD_REKEY)
{
private_child_rekey_t *rekey = (private_child_rekey_t*)other;
if (rekey == NULL || rekey->child_sa != this->child_sa)
if (rekey->child_sa != this->child_sa)
{
/* not the same child => no collision */
other->destroy(other);
@ -399,7 +399,7 @@ static void collide(private_child_rekey_t *this, task_t *other)
other->destroy(other);
return;
}
if (del == NULL || del->get_child(del) != this->child_sa)
if (del->get_child(del) != this->child_sa)
{
/* not the same child => no collision */
other->destroy(other);