diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:55:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:55:07 -0500 |
| commit | eba989bf0e7761713079e4f2af91c9ab9374a300 (patch) | |
| tree | 7d685ffec17e9916c412e9fe27e8793753c0d0e9 | |
| parent | 763ccd092899c50392681f0f682635efe2b22c4f (diff) | |
| parent | 1043532a5155cdd2667808e8db2e5de5c486ed8b (diff) | |
| download | tor-eba989bf0e7761713079e4f2af91c9ab9374a300.tar.gz tor-eba989bf0e7761713079e4f2af91c9ab9374a300.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
| -rw-r--r-- | changes/bug28419 | 3 | ||||
| -rw-r--r-- | src/tools/tor_runner.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug28419 b/changes/bug28419 new file mode 100644 index 0000000000..52ceb0a2a7 --- /dev/null +++ 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 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 */ |