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 | cca803e2b01a107f569433a85dd62f20c7803f27 (patch) | |
| tree | 7dac88d9ef534eef3126a1b2d6ffd6e379ab69ee | |
| parent | 15c99be9637fd6c3dfc9f45a24fd06054dffd140 (diff) | |
| parent | db3acb3aa398bda46435d94427967410da173222 (diff) | |
| download | tor-cca803e2b01a107f569433a85dd62f20c7803f27.tar.gz tor-cca803e2b01a107f569433a85dd62f20c7803f27.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -rw-r--r-- | changes/bug28419 | 3 | ||||
| -rw-r--r-- | src/tools/tor_runner.c | 3 |
2 files changed, 5 insertions, 1 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 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 */ } } - |