tor

commit f7707c9031381cf3ceb663d3bc3a9c81e346a90d
parent 880d596f4dbb65885ebbc8b1b88e852529779324
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 23 Oct 2017 15:55:48 -0400

Merge branch 'maint-0.3.2'

Diffstat:
A
changes/bug23874
 | 
3
+++
M
src/or/nodelist.c
 | 
5
+++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug23874 b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+    - Clear the address when node_get_prim_orport() returns early.
+      Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
@@ -1435,6 +1435,11 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(&ap_out->addr, AF_INET);
+  ap_out->port = 0;
+
   /* Check ri first, because rewrite_node_address_for_bridge() updates
    * node->ri with the configured bridge address. */