From: Roger Dingledine <arma@torproject.org>
Date: Sat, 27 Oct 2007 21:40:32 +0000 (+0000)
Subject: we need to send nick to the chalkboard to type 'un' 1000 times:
X-Git-Tag: tor-0.2.0.10-alpha~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ca7c118ece7f6b14dc5a3ea00ee208128fc5ef9;p=thirdparty%2Ftor.git

we need to send nick to the chalkboard to type 'un' 1000 times:

Stop servers from crashing if they set a Family option (or
maybe in other situations too). Bugfix on 0.2.0.9-alpha; reported
by Fabian Keil.


svn:r12235
---

diff --git a/ChangeLog b/ChangeLog
index c373210f32..062c55d925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 Changes in version 0.2.0.10-alpha - 2007-1?-??
+  o Major bugfixes:
+    - Stop servers from crashing if they set a Family option (or
+      maybe in other situations too). Bugfix on 0.2.0.9-alpha; reported
+      by Fabian Keil.
+
   o New requirements:
     - Drop support for OpenSSL version 0.9.6.  Just about nobody was using
       it, it had no AES, and it hasn't seen any security patches since 2004.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index ac8949ff46..a0538be8a1 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -885,7 +885,9 @@ networkstatus_get_router_digest_by_nickname(const char *nickname)
 int
 networkstatus_nickname_is_unnamed(const char *nickname)
 {
-  return strmap_get_lc(named_server_map, nickname) != NULL;
+  if (!unnamed_server_map)
+    return 0;
+  return strmap_get_lc(unnamed_server_map, nickname) != NULL;
 }
 
 /** How frequently do directory authorities re-download fresh networkstatus