tor

commit eba989bf0e7761713079e4f2af91c9ab9374a300
parent 763ccd092899c50392681f0f682635efe2b22c4f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 14 Nov 2018 07:55:07 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

Diffstat:
A
changes/bug28419
 | 
4
++++
M
src/tools/tor_runner.c
 | 
2
++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug28419 b/changes/bug28419
@@ -0,0 +1,3 @@
+  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
diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c
@@ -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 */