diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-20 14:28:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-20 14:28:31 -0500 |
| commit | 26053bd7c90b2bd8e72bc836c48434c8d6de633f (patch) | |
| tree | 74c1be7776a7a4ad2c9d0bceb7a1ec0e0a634fe1 /src/or/transports.c | |
| parent | ba1766bc3f2ed18662f3ef3a527ca75a54ee9595 (diff) | |
| parent | 539cb627f71b476eb325ae6fff829b1f360ada00 (diff) | |
| download | tor-26053bd7c90b2bd8e72bc836c48434c8d6de633f.tar.gz tor-26053bd7c90b2bd8e72bc836c48434c8d6de633f.zip | |
Merge remote-tracking branch 'asn-mytor/bug4725_take2'
Diffstat (limited to 'src/or/transports.c')
| -rw-r--r-- | src/or/transports.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index 6ee4878689..abf9d884f7 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -919,13 +919,18 @@ static char * get_bindaddr_for_proxy(const managed_proxy_t *mp) { char *bindaddr = NULL; + char *bindaddr_tmp = NULL; smartlist_t *string_tmp = smartlist_create(); tor_assert(mp->is_server); SMARTLIST_FOREACH_BEGIN(mp->transports_to_launch, char *, t) { - tor_asprintf(&bindaddr, "%s-%s", t, get_bindaddr_for_transport(t)); + bindaddr_tmp = get_bindaddr_for_transport(t); + + tor_asprintf(&bindaddr, "%s-%s", t, bindaddr_tmp); smartlist_add(string_tmp, bindaddr); + + tor_free(bindaddr_tmp); } SMARTLIST_FOREACH_END(t); bindaddr = smartlist_join_strings(string_tmp, ",", 0, NULL); |