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

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

Browse Source
This commit is contained in:
Nick Mathewson 2017-10-23 15:53:45 -04:00
commit b1bd1bf19f
2 changed files with 11 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.

8
src/or/nodelist.c
View File

@ -1031,6 +1031,14 @@ 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. */
RETURN_IPV4_AP(node->ri, or_port, ap_out);
RETURN_IPV4_AP(node->rs, or_port, ap_out);
/* Microdescriptors only have an IPv6 address */