[or-cvs] r11293: Check for absent nickname when making extend info. I still d (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-27 20:00:32 -0400 (Mon, 27 Aug 2007)
New Revision: 11293

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuitbuild.c
Log:
 r14821 at 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14821] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-27 23:42:46 UTC (rev 11292)
+++ tor/trunk/ChangeLog	2007-08-28 00:00:32 UTC (rev 11293)
@@ -3,6 +3,10 @@
     - 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:

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2007-08-27 23:42:46 UTC (rev 11292)
+++ tor/trunk/src/or/circuitbuild.c	2007-08-28 00:00:32 UTC (rev 11293)
@@ -1740,7 +1740,8 @@
 {
   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;