commit 795582169aa9a710739fbb7f3f651e337032df4a Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 27 08:12:14 2017 -0500

Bulletproof conn_get_outbound_address() a little. --- src/or/connection.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c index 4421534..1882760 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1902,10 +1902,18 @@ conn_get_outbound_address(sa_family_t family, { const tor_addr_t *ext_addr = NULL;

- int fam_index=0; - if (family==AF_INET6) { - fam_index=1; + int fam_index; + switch (family) { + case AF_INET: + fam_index = 0; + break; + case AF_INET6: + fam_index = 1; + break; + default: + return NULL; } + // If an exit connection, use the exit address (if present) if (conn_type == CONN_TYPE_EXIT) { if (!tor_addr_is_null(