From 0d5c0072663a042a186bebc12a4eaa1ce3c43b56 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 18 Oct 2005 21:19:02 +0000
Subject: [PATCH] Fix tor26's first segfault

svn:r5281
---
 src/or/routerlist.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7904559fb4..46b4e2485a 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;