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

Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson 2013-04-18 21:33:53 -04:00
commit e35ca13528
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug8716 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (memory leak):
- Fix a memory leak that would occur whenever a configuration
option changed. Fixes bug #8718; bugfix on 0.2.3.3-alpha.

3
src/or/config.c
View File

@ -620,12 +620,13 @@ set_options(or_options_t *new_val, char **msg)
tor_free(line);
}
} else {
smartlist_add(elements, (char*)options_format.vars[i].name);
smartlist_add(elements, tor_strdup(options_format.vars[i].name));
smartlist_add(elements, NULL);
}
}
}
control_event_conf_changed(elements);
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
smartlist_free(elements);
}

2
src/or/control.c
View File

@ -4393,7 +4393,7 @@ control_event_guard(const char *nickname, const char *digest,
* a smartlist_t containing (key, value, ...) pairs in sequence.
* <b>value</b> can be NULL. */
int
control_event_conf_changed(smartlist_t *elements)
control_event_conf_changed(const smartlist_t *elements)
{
int i;
char *result;

2
src/or/control.h
View File

@ -72,7 +72,7 @@ int control_event_server_status(int severity, const char *format, ...)
CHECK_PRINTF(2,3);
int control_event_guard(const char *nickname, const char *digest,
const char *status);
int control_event_conf_changed(smartlist_t *elements);
int control_event_conf_changed(const smartlist_t *elements);
int control_event_buildtimeout_set(const circuit_build_times_t *cbt,
buildtimeout_set_event_t type);
int control_event_signal(uintptr_t signal);