tor

commit 811ed8cf9f58d8480244483f4ad012ea9dca42ef
parent 5823e62fa2a83fb1f7a27c82be930749e3a4782d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 30 Jul 2018 08:24:14 -0400

Merge remote-tracking branch 'rl1987/bug26892_take2'

Diffstat:
A
changes/bug26892
 | 
6
++++++
M
src/feature/relay/router.c
 | 
3
+++

2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/bug26892 b/changes/bug26892
@@ -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.
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
@@ -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)