From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 19 Apr 2014 00:41:40 +0000 (-0400)
Subject: scan-build: get_proxy_addrport should always set its outputs
X-Git-Tag: tor-0.2.5.4-alpha~14^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=895b6789e8b33af180a00d843eb25343bace4a4d;p=thirdparty%2Ftor.git

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

diff --git a/src/or/connection.c b/src/or/connection.c
index 2e72e6b397..5dbc477283 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;
 }