diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-11 16:14:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-11 16:14:17 -0500 |
| commit | 5f29bc71b37a83e6d583864ad9b7cd97f513e24a (patch) | |
| tree | 42824beecc76456ab2348cc2e18d058f5c527f8b /src | |
| parent | fd8ef8dc573e0d20141fbd352a24a8c7fd0e305b (diff) | |
| parent | afca9ab14ee16b8dcfcde40a13d49f3612138dcb (diff) | |
| download | tor-5f29bc71b37a83e6d583864ad9b7cd97f513e24a.tar tor-5f29bc71b37a83e6d583864ad9b7cd97f513e24a.tar.gz | |
Merge remote-tracking branch 'public/bug7816_023'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0f8441b18..7ca20e46b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -606,9 +606,12 @@ set_options(or_options_t *new_val, char **msg) var_name, 1); if (line) { - for (; line; line = line->next) { + config_line_t *next; + for (; line; line = next) { + next = line->next; smartlist_add(elements, line->key); smartlist_add(elements, line->value); + tor_free(line); } } else { smartlist_add(elements, (char*)options_format.vars[i].name); |