diff options
| author | Peter Palfrader <peter@palfrader.org> | 2005-10-18 21:19:02 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2005-10-18 21:19:02 +0000 |
| commit | 0d5c0072663a042a186bebc12a4eaa1ce3c43b56 (patch) | |
| tree | e19651fdbc9f899322579b1f74cead23ba894fc7 | |
| parent | d25873ae9c2e4e9030efb20ee5b7df0b1c8df6e2 (diff) | |
| download | tor-0d5c0072663a042a186bebc12a4eaa1ce3c43b56.tar tor-0d5c0072663a042a186bebc12a4eaa1ce3c43b56.tar.gz | |
Fix tor26's first segfault
svn:r5281
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7904559fb..46b4e2485 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2934,7 +2934,9 @@ router_differences_are_cosmetic(routerinfo_t *r1, routerinfo_t *r2) crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) || crypto_pk_cmp_keys(r1->identity_pkey, r2->identity_pkey) || strcasecmp(r1->platform, r2->platform) || - strcasecmp(r1->contact_info, r2->contact_info) || + (r1->contact_info && !r2->contact_info) || /* contact_info is optional */ + (!r1->contact_info && r2->contact_info) || + (r1->contact_info && r2->contact_info && strcasecmp(r1->contact_info, r2->contact_info)) || r1->is_hibernating != r2->is_hibernating || config_cmp_addr_policies(r1->exit_policy, r2->exit_policy)) return 0; |