diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-22 10:19:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-22 10:19:52 -0400 |
| commit | e085b11d27f3396e0fd49156d74245594fd4eb88 (patch) | |
| tree | 3e8012c3524af8e00d57540527a67f1f504b0b19 | |
| parent | 6e181bafff0b62688bae02998784a8e4b7f2167d (diff) | |
| parent | 0ba05313d56e6737c73d003c84eeebdfd0d40398 (diff) | |
| download | tor-e085b11d27f3396e0fd49156d74245594fd4eb88.tar.gz tor-e085b11d27f3396e0fd49156d74245594fd4eb88.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | changes/bug19947 | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug19947 b/changes/bug19947 new file mode 100644 index 0000000000..b9dce8b753 --- /dev/null +++ b/changes/bug19947 @@ -0,0 +1,4 @@ + o Minor bugfixes (fallback directories): + - Avoid logging a NULL string pointer when loading fallback directory information. + Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha. + Report and patch by "rubiate". diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 620c32d641..c3588726f7 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4337,10 +4337,10 @@ dir_server_new(int is_authority, if (nickname) tor_asprintf(&ent->description, "directory server \"%s\" at %s:%d", - nickname, hostname, (int)dir_port); + nickname, hostname_, (int)dir_port); else tor_asprintf(&ent->description, "directory server at %s:%d", - hostname, (int)dir_port); + hostname_, (int)dir_port); ent->fake_status.addr = ent->addr; tor_addr_copy(&ent->fake_status.ipv6_addr, &ent->ipv6_addr); |