commit 1abe0a5769f3fe7c2a36975acd8ab1e861925f51 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 17 19:41:51 2018 -0400

Add an initialization case to node_get_prim_dirport

Fixes a bug found by scan-build; bugfix on c2fa743806acc. Bug not in any released Tor. --- src/or/nodelist.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 81a5c944a..bbcfb6cff 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1583,6 +1583,11 @@ node_get_prim_dirport(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. */