tor

commit 1043532a5155cdd2667808e8db2e5de5c486ed8b
parent 42be1c668b9f8ec255afb307054e6388f478e837
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 14 Nov 2018 07:55:07 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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

2 files changed, 6 insertions(+), 1 deletion(-)
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
@@ -80,6 +80,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)
@@ -93,9 +94,9 @@ child(const tor_main_configuration_t *cfg)
   int rv = execv(BINDIR "/tor", args);
 
   if (rv < 0) {
+    real_free(args);
     exit(254);
   } else {
     abort(); /* Unreachable */
   }
 }
-