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
This commit is contained in:
Nick Mathewson 2007-08-28 00:00:32 +00:00
parent 79a3fed30e
commit a4cc3e4be1
2 changed files with 6 additions and 1 deletions

View File

@ -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 - As a client, do not believe any server that tells us that any address
maps to an internal address space. 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 Changes in version 0.2.0.6-alpha - 2007-08-26
o New directory authorities: o New directory authorities:

View File

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