diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-10-26 22:40:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-10-26 22:40:24 -0400 |
| commit | 8519d36633882ac5971c363a4920466b054a62f6 (patch) | |
| tree | 40b8ba71562828a431cabd043785476ec4d58467 /src | |
| parent | 071521e02f1e5b966c86324dfadbbef52900707f (diff) | |
| parent | e50e7395567c437370223a1cd20f29cd10bf3812 (diff) | |
| download | tor-8519d36633882ac5971c363a4920466b054a62f6.tar tor-8519d36633882ac5971c363a4920466b054a62f6.tar.gz | |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/control.c | 1 | ||||
| -rw-r--r-- | src/or/router.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index df346081a..5a0ced29d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2254,6 +2254,7 @@ option_clear(config_format_t *fmt, or_options_t *options, config_var_t *var) break; case CONFIG_TYPE_ISOTIME: *(time_t*)lvalue = 0; + break; case CONFIG_TYPE_INTERVAL: case CONFIG_TYPE_UINT: case CONFIG_TYPE_BOOL: @@ -2267,6 +2268,7 @@ option_clear(config_format_t *fmt, or_options_t *options, config_var_t *var) routerset_free(*(routerset_t**)lvalue); *(routerset_t**)lvalue = NULL; } + break; case CONFIG_TYPE_CSV: if (*(smartlist_t**)lvalue) { SMARTLIST_FOREACH(*(smartlist_t **)lvalue, char *, cp, tor_free(cp)); diff --git a/src/or/control.c b/src/or/control.c index 554aef6b2..0f744f7b9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1456,6 +1456,7 @@ getinfo_helper_dir(control_connection_t *control_conn, if (res) { log_warn(LD_CONTROL, "getinfo '%s': %s", question, msg); smartlist_free(descs); + tor_free(url); return -1; } SMARTLIST_FOREACH(descs, signed_descriptor_t *, sd, diff --git a/src/or/router.c b/src/or/router.c index 85abc8c5f..145301cd0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -590,6 +590,7 @@ init_keys(void) if (write_str_to_file(keydir, fingerprint_line, 0)) { log_err(LD_FS, "Error writing fingerprint line to file"); tor_free(keydir); + tor_free(cp); return -1; } } |