nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Insert the environment variable only if we have options to pass.

Browse Source
This commit is contained in:
George Kadianakis 2013-06-13 12:18:07 +03:00 committed by Nick Mathewson
parent 133f380c87
commit c71809d403
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/transports.c
View File

@ -1134,7 +1134,9 @@ get_transport_options_for_server_proxy(const managed_proxy_t *mp)
smartlist_free(options_tmp_sl);
} SMARTLIST_FOREACH_END(transport);
options_string = smartlist_join_strings(string_sl, ";", 0, NULL);
if (smartlist_len(string_sl)) {
options_string = smartlist_join_strings(string_sl, ";", 0, NULL);
}
SMARTLIST_FOREACH(string_sl, char *, t, tor_free(t));
smartlist_free(string_sl);
@ -1226,9 +1228,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp)
{
char *server_transport_options =
get_transport_options_for_server_proxy(mp);
smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s",
server_transport_options);
tor_free(server_transport_options);
if (server_transport_options) {
smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s",
server_transport_options);
tor_free(server_transport_options);
}
}
/* XXX024 Remove the '=' here once versions of obfsproxy which