tor

commit e18840f619c274cdca476e741ba3edecefbcc3f7
parent ea929e8456d065a25d7eb5e2e0e41e0f303ebe9d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 11 Dec 2017 11:49:57 -0500

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:
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");