nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5'

Browse Source
This commit is contained in:
Nick Mathewson 2018-11-14 07:55:07 -05:00
commit 3deb01e1a4
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug28419 Normal file
View File

@ -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.

2
src/tools/tor_runner.c
View File

@ -86,6 +86,7 @@ tor_run_main(const tor_main_configuration_t *cfg)
/* circumlocution to avoid getting warned about calling calloc instead of /* circumlocution to avoid getting warned about calling calloc instead of
* tor_calloc. */ * tor_calloc. */
#define real_calloc calloc #define real_calloc calloc
#define real_free free
static void static void
child(const tor_main_configuration_t *cfg) child(const tor_main_configuration_t *cfg)
@ -103,6 +104,7 @@ child(const tor_main_configuration_t *cfg)
int rv = execv(BINDIR "/tor", args); int rv = execv(BINDIR "/tor", args);
if (rv < 0) { if (rv < 0) {
real_free(args);
exit(254); exit(254);
} else { } else {
abort(); /* Unreachable */ abort(); /* Unreachable */