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

Merge branch 'maint-0.3.2'

Browse Source
This commit is contained in:
Nick Mathewson 2017-10-23 15:55:48 -04:00
commit f7707c9031
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug23874 Normal file
View File

@ -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.

5
src/or/nodelist.c
View File

@ -1435,6 +1435,11 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out)
node_assert_ok(node); node_assert_ok(node);
tor_assert(ap_out); 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 /* Check ri first, because rewrite_node_address_for_bridge() updates
* node->ri with the configured bridge address. */ * node->ri with the configured bridge address. */