mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 06:13:31 +01:00
Merge branch 'maint-0.3.5'
This commit is contained in:
commit
3deb01e1a4
3
changes/bug28419
Normal file
3
changes/bug28419
Normal 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.
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user