diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-11 11:49:57 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-11 11:49:57 -0500 |
| commit | e18840f619c274cdca476e741ba3edecefbcc3f7 (patch) | |
| tree | 439bad9cd1194c113ea02e9a8eb13357bd1aa08c /src/tools | |
| parent | ea929e8456d065a25d7eb5e2e0e41e0f303ebe9d (diff) | |
| download | tor-e18840f619c274cdca476e741ba3edecefbcc3f7.tar.gz tor-e18840f619c274cdca476e741ba3edecefbcc3f7.zip | |
Fix the log-severities memory-leak in tor-resolve.c
Also, rename the variable to have a more manageable name, and make
its scope more clear.
Fixes bug 24582; bugfix on 0.2.1.1-alpha.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-resolve.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 1e2409a131..966b88b3e8 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -347,7 +347,6 @@ main(int argc, char **argv) int n_args; tor_addr_t result; char *result_hostname = NULL; - log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t)); init_logging(1); sandbox_disable_getaddrinfo_cache(); @@ -398,11 +397,14 @@ main(int argc, char **argv) usage(); } + log_severity_list_t *severities = + tor_malloc_zero(sizeof(log_severity_list_t)); if (isVerbose) - set_log_severity_config(LOG_DEBUG, LOG_ERR, s); + set_log_severity_config(LOG_DEBUG, LOG_ERR, severities); else - set_log_severity_config(LOG_WARN, LOG_ERR, s); - add_stream_log(s, "<stderr>", fileno(stderr)); + set_log_severity_config(LOG_WARN, LOG_ERR, severities); + add_stream_log(severities, "<stderr>", fileno(stderr)); + tor_free(severities); if (n_args == 1) { log_debug(LD_CONFIG, "defaulting to localhost"); |