]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
fix segfault when specifying DirServer without nickname
authorRoger Dingledine <arma@torproject.org>
Sun, 18 Dec 2005 22:45:27 +0000 (22:45 +0000)
committerRoger Dingledine <arma@torproject.org>
Sun, 18 Dec 2005 22:45:27 +0000 (22:45 +0000)
(reported by weasel)

svn:r5614

src/or/routerlist.c

index 5c9d9b23070fe9259405b7352666f4fdce088819..4cb05ac72dfc08f844d15e971efed74d9cef20cc 100644 (file)
@@ -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);