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
commit1043532a5155cdd2667808e8db2e5de5c486ed8b (patch)
tree1dcbb71f1794c40aacec84dff7586195cbbc08db /src/tools
parent42be1c668b9f8ec255afb307054e6388f478e837 (diff)
parentdb3acb3aa398bda46435d94427967410da173222 (diff)
downloadtor-1043532a5155cdd2667808e8db2e5de5c486ed8b.tar.gz
tor-1043532a5155cdd2667808e8db2e5de5c486ed8b.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tor_runner.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c
index 9ed2ee5775..cad57a7665 100644
--- 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 */
}
}
-