From 0825f61102242af15d99f3083e45db24471b8260 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 4 Apr 2006 03:25:36 +0000 Subject: [PATCH] fix crash bug reported in flyspray 279. svn:r6312 --- src/or/routerlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 69140c09aa..2cb3dd2e0f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -967,7 +967,7 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) continue; rs = router_get_combined_status_by_digest( router->cache_info.identity_digest); - if (!rs->name_lookup_warned) { + if (rs && !rs->name_lookup_warned) { rs->name_lookup_warned = 1; any_unwarned = 1; } @@ -984,7 +984,7 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) log_warn(LD_CONFIG, "There are multiple matches for the nickname \"%s\"," " but none is listed as named by the directory authories. " - "Choosing one arbitrarily. If you meant one in particular, " + "Choosing one arbitrarily. If you meant one in particular, " "you should say %s.", nickname, alternatives); tor_free(alternatives); }