nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rl1987/bug26892_take2'

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-30 08:24:14 -04:00
commit 811ed8cf9f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug26892 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (logging):
- As a precaution, do an early return from
log_addr_has_changed() if Tor is running as client. Also,
log a stack trace for debugging as this function should only
be called when Tor runs as server. Fixes bug 26892;
bugfix on 0.1.1.9-alpha.

3
src/feature/relay/router.c
View File

@ -2686,6 +2686,9 @@ log_addr_has_changed(int severity,
char addrbuf_prev[TOR_ADDR_BUF_LEN];
char addrbuf_cur[TOR_ADDR_BUF_LEN];
if (BUG(!server_mode(get_options())))
return;
if (tor_addr_to_str(addrbuf_prev, prev, sizeof(addrbuf_prev), 1) == NULL)
strlcpy(addrbuf_prev, "???", TOR_ADDR_BUF_LEN);
if (tor_addr_to_str(addrbuf_cur, cur, sizeof(addrbuf_cur), 1) == NULL)