tor

commit a3d1c38ea6e62dfd01771c39124b703807f22393
parent 42751e2123f6dcc87f3992d38c1889f7da981a7b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 11 Jan 2018 19:57:57 -0500

Merge branch 'bug24582'

Diffstat:
A
changes/bug24582
 | 
4
++++
M
src/tools/tor-resolve.c
 | 
10
++++++----

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/changes/bug24582 b/changes/bug24582
@@ -0,0 +1,4 @@
+  o Minor bugfixes (debugging, memory leaks):
+    - Fix a harmless memory leak in tor-resolve. Fixes bug 24582;
+      bugfix on 0.2.1.1-alpha.
+
diff --git 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");