From: Roger Dingledine <arma@torproject.org>
Date: Sun, 18 Dec 2005 22:45:27 +0000 (+0000)
Subject: fix segfault when specifying DirServer without nickname
X-Git-Tag: tor-0.1.1.11-alpha~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34249e8861eb549d37600eccde632ac6142d57db;p=thirdparty%2Ftor.git

fix segfault when specifying DirServer without nickname
(reported by weasel)


svn:r5614
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 5c9d9b2307..4cb05ac72d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2558,8 +2558,11 @@ add_trusted_dir_server(const char *nickname, const char *address,
 
   ent->fake_status.addr = ent->addr;
   memcpy(ent->fake_status.identity_digest, digest, DIGEST_LEN);
-  strlcpy(ent->fake_status.nickname, nickname,
-          sizeof(ent->fake_status.nickname));
+  if (nickname)
+    strlcpy(ent->fake_status.nickname, nickname,
+            sizeof(ent->fake_status.nickname));
+  else
+    ent->fake_status.nickname[0] = '\0';
   ent->fake_status.dir_port = ent->dir_port;
 
   smartlist_add(trusted_dir_servers, ent);