diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-18 21:33:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 21:33:53 -0400 |
| commit | e35ca135282c6b833f51543988580bd860b49be6 (patch) | |
| tree | 32af651edb4c427729f808377a0726212a0948be /src/or/config.c | |
| parent | 06efbbb47ef28dd24cb4482f5b82204918891f41 (diff) | |
| parent | 0a9c17a61ad7193a051c53ea2a0cb91e012f014e (diff) | |
| download | tor-e35ca135282c6b833f51543988580bd860b49be6.tar.gz tor-e35ca135282c6b833f51543988580bd860b49be6.zip | |
Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 20a3c20fb9..e86942cfe1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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); } |