summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-14 07:55:07 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-14 07:55:07 -0500
commiteba989bf0e7761713079e4f2af91c9ab9374a300 (patch)
tree7d685ffec17e9916c412e9fe27e8793753c0d0e9 /src/tools
parent763ccd092899c50392681f0f682635efe2b22c4f (diff)
parent1043532a5155cdd2667808e8db2e5de5c486ed8b (diff)
downloadtor-eba989bf0e7761713079e4f2af91c9ab9374a300.tar.gz
tor-eba989bf0e7761713079e4f2af91c9ab9374a300.zip
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tor_runner.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c
index b07b72a095..d962e5abc7 100644
--- 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 */