aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-18 20:41:40 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-18 20:41:40 -0400
commit895b6789e8b33af180a00d843eb25343bace4a4d (patch)
tree44be4a0099c8104d9123911b1f1c50d0f4ac37f0
parent7cd9520ba9713c10ef9f958a977a1d3d8d1a2c4c (diff)
downloadtor-895b6789e8b33af180a00d843eb25343bace4a4d.tar
tor-895b6789e8b33af180a00d843eb25343bace4a4d.tar.gz
scan-build: get_proxy_addrport should always set its outputs
When get_proxy_addrport returned PROXY_NONE, it would leave addr/port unset. This is inconsistent, and could (if we used the function in a stupid way) lead to undefined behavior. Bugfix on 5b050a9b0, though I don't think it affects tor-as-it-is.
-rw-r--r--src/or/connection.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 2e72e6b39..5dbc47728 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4814,6 +4814,8 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type,
}
}
+ tor_addr_make_unspec(addr);
+ *port = 0;
*proxy_type = PROXY_NONE;
return 0;
}