nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-20 17:49:56 -04:00
commit f24797a587
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/util.c
View File

@ -4678,8 +4678,8 @@ process_environment_t *
process_environment_make(struct smartlist_t *env_vars) process_environment_make(struct smartlist_t *env_vars)
{ {
process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t)); process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t));
size_t n_env_vars = smartlist_len(env_vars); int n_env_vars = smartlist_len(env_vars);
size_t i; int i;
size_t total_env_length; size_t total_env_length;
smartlist_t *env_vars_sorted; smartlist_t *env_vars_sorted;

5
src/or/control.c
View File

@ -4647,7 +4647,7 @@ handle_control_add_onion(control_connection_t *conn,
const char *body) const char *body)
{ {
smartlist_t *args; smartlist_t *args;
size_t arg_len; int arg_len;
(void) len; /* body is nul-terminated; it's safe to ignore the length */ (void) len; /* body is nul-terminated; it's safe to ignore the length */
args = getargs_helper("ADD_ONION", conn, body, 2, -1); args = getargs_helper("ADD_ONION", conn, body, 2, -1);
if (!args) if (!args)
@ -4668,7 +4668,7 @@ handle_control_add_onion(control_connection_t *conn,
rend_auth_type_t auth_type = REND_NO_AUTH; rend_auth_type_t auth_type = REND_NO_AUTH;
/* Default to adding an anonymous hidden service if no flag is given */ /* Default to adding an anonymous hidden service if no flag is given */
int non_anonymous = 0; int non_anonymous = 0;
for (size_t i = 1; i < arg_len; i++) { for (int i = 1; i < arg_len; i++) {
static const char *port_prefix = "Port="; static const char *port_prefix = "Port=";
static const char *flags_prefix = "Flags="; static const char *flags_prefix = "Flags=";
static const char *max_s_prefix = "MaxStreams="; static const char *max_s_prefix = "MaxStreams=";
@ -7786,4 +7786,3 @@ control_testing_set_global_event_mask(uint64_t mask)
global_event_mask = mask; global_event_mask = mask;
} }
#endif /* defined(TOR_UNIT_TESTS) */ #endif /* defined(TOR_UNIT_TESTS) */

1
src/or/geoip.c
View File

@ -1884,4 +1884,3 @@ geoip_free_all(void)
memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip_digest, 0, sizeof(geoip_digest));
memset(geoip6_digest, 0, sizeof(geoip6_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest));
} }