[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/release-0.3.0] Clear the address when node_get_prim_orport() returns early
commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor <teor2345@xxxxxxxxx>
Date: Sun Oct 15 16:45:15 2017 -0400
Clear the address when node_get_prim_orport() returns early
Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
changes/bug23874 | 3 +++
src/or/nodelist.c | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 000000000..bf6620553
--- /dev/null
+++ 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
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -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 */
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits