diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-04-14 13:19:09 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-04-14 18:10:27 +0200 |
| commit | 3c0c32177636f6794b6a8ce9ad9c49b7b4b31e39 (patch) | |
| tree | eeff458b7d5d25c6b8158b17c96c7affc8163d7a /src | |
| parent | cc2429d9a25417551ca49d143cb209f852a53db2 (diff) | |
| download | strongswan-3c0c32177636f6794b6a8ce9ad9c49b7b4b31e39.tar.bz2 strongswan-3c0c32177636f6794b6a8ce9ad9c49b7b4b31e39.tar.xz | |
Neither rekey nor del can be NULL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/sa/tasks/child_rekey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcharon/sa/tasks/child_rekey.c b/src/libcharon/sa/tasks/child_rekey.c index 33b5b5215..b39a5fc67 100644 --- a/src/libcharon/sa/tasks/child_rekey.c +++ b/src/libcharon/sa/tasks/child_rekey.c @@ -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); |