Commit eba989bf authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.4' into maint-0.3.5

parents 763ccd09 1043532a

changes/bug28419

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

    - Fix a harmless memory leak in libtorrunner.a. Fixes bug 28419;

      bugfix on 0.3.3.1-alpha.  Patch from Martin Kepplinger.
 
 No newline at end of file

src/tools/tor_runner.c

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ tor_run_main(const tor_main_configuration_t *cfg) 
/* circumlocution to avoid getting warned about calling calloc instead of

 * tor_calloc. */

#define real_calloc calloc

#define real_free free



static void

child(const tor_main_configuration_t *cfg)
@@ -103,6 +104,7 @@ child(const tor_main_configuration_t *cfg) 
  int rv = execv(BINDIR "/tor", args);



  if (rv < 0) {

    real_free(args);

    exit(254);

  } else {

    abort(); /* Unreachable */