diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-28 00:00:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-28 00:00:32 +0000 |
| commit | a4cc3e4be1c297f6b77d151e0d21b2373c72ac7d (patch) | |
| tree | a0f9e3a73f43b68292a6fc3b706929bbe4609831 | |
| parent | 79a3fed30e953285be083c67f0a871b09153fbd2 (diff) | |
| download | tor-a4cc3e4be1c297f6b77d151e0d21b2373c72ac7d.tar tor-a4cc3e4be1c297f6b77d151e0d21b2373c72ac7d.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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: diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 8df590820..972d48951 100644 --- a/src/or/circuitbuild.c +++ b/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; |