torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not pass NULL to log(%s) in dir_server_new.

Browse Source 
This bug had existed since 0.2.4.7-alpha, but now that we have
FallbackDirs by default, it actually matters.

Fixes bug 19947; bugfix on 0.2.4.7-alpha or maybe 0.2.8.1-alpha.

Rubiate wrote the patch; teor wrote the changes file.
This commit is contained in:
Nick Mathewson
2016-08-22 01:22:19 -04:00
parent 65cf5130ef
commit 0ba05313d5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug19947
+4
View File
@@ -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".
src/or/routerlist.c
+2 -2
View File
@@ -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);