Commit e18840f6 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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.
parent ea929e84

changes/bug24582

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (debugging, memory leaks):

    - Fix a harmless memory leak in tor-resolve. Fixes bug 24582;

      bugfix on 0.2.1.1-alpha.

src/tools/tor-resolve.c

+6 −4
Original line number Diff line number Diff line
@@ -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");