Browse Source

r14821@catbus: nickm | 2007-08-27 19:57:56 -0400
Check for absent nickname when making extend info. I still dont know when this happens, but it is easy enough to check for. Fixes bug 467.


svn:r11293

Nick Mathewson 17 years ago
parent
commit
a4cc3e4be1
2 changed files with 6 additions and 1 deletions
  1. 4 0
      ChangeLog
  2. 2 1
      src/or/circuitbuild.c

+ 4 - 0
ChangeLog

@@ -3,6 +3,10 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
     - As a client, do not believe any server that tells us that any address
       maps to an internal address space.
 
+  o Minor bugfixes:
+    - When generating information telling us how to extend to a given
+      router, do not try to include the nickname if it is absent.  Fixes
+      bug 467.
 
 Changes in version 0.2.0.6-alpha - 2007-08-26
   o New directory authorities:

+ 2 - 1
src/or/circuitbuild.c

@@ -1740,7 +1740,8 @@ extend_info_alloc(const char *nickname, const char *digest,
 {
   extend_info_t *info = tor_malloc_zero(sizeof(extend_info_t));
   memcpy(info->identity_digest, digest, DIGEST_LEN);
-  strlcpy(info->nickname, nickname, sizeof(info->nickname));
+  if (nickname)
+    strlcpy(info->nickname, nickname, sizeof(info->nickname));
   if (onion_key)
     info->onion_key = crypto_pk_dup_key(onion_key);
   info->addr = addr;