diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-17 19:32:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-17 19:32:08 -0400 |
| commit | d5e4b6983f88d6a31303008897e6f75e9a9777ff (patch) | |
| tree | 82bc7466e3363bb13a123e152ec832311810c35a /src/common | |
| parent | 987174cc6fb4915299236fd76e3bb6c893e78653 (diff) | |
| parent | 39bbb8d9cfb0258b1e65dc98177e0773a19e4eb0 (diff) | |
| download | tor-d5e4b6983f88d6a31303008897e6f75e9a9777ff.tar.gz tor-d5e4b6983f88d6a31303008897e6f75e9a9777ff.zip | |
Merge remote-tracking branch 'rl1987/bug26282'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/util.c b/src/common/util.c index 53e4507f1f..b0eb96306f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4813,7 +4813,7 @@ process_environment_make(struct smartlist_t *env_vars) total_env_length = 1; /* terminating NUL of terminating empty string */ for (i = 0; i < n_env_vars; ++i) { - const char *s = smartlist_get(env_vars, i); + const char *s = smartlist_get(env_vars, (int)i); size_t slen = strlen(s); tor_assert(slen + 1 != 0); @@ -4843,7 +4843,7 @@ process_environment_make(struct smartlist_t *env_vars) const char *prev_env_var = NULL; for (i = 0; i < n_env_vars; ++i) { - const char *s = smartlist_get(env_vars_sorted, i); + const char *s = smartlist_get(env_vars_sorted, (int)i); size_t slen = strlen(s); size_t s_name_len = str_num_before(s, '='); |