summaryrefslogtreecommitdiff
path: root/src
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
commit3deb01e1a4209fabd6313acc273765ab02f481cf (patch)
tree878278c10358496a4197912152d40ba5ab7e07c6 /src
parentc7f09554eb0bb3dc9413adb255a45e4e94add1ef (diff)
parenteba989bf0e7761713079e4f2af91c9ab9374a300 (diff)
downloadtor-3deb01e1a4209fabd6313acc273765ab02f481cf.tar.gz
tor-3deb01e1a4209fabd6313acc273765ab02f481cf.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src')
-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 */