diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-10 11:27:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-10 11:27:28 -0400 |
| commit | 43f95e38abefced37ad24966d56298e972cebf81 (patch) | |
| tree | 2d0fd841df124568d81644b321f1c926dda9226d /src | |
| parent | df4693fed57d0a0026186beaa6bb819b854c5b10 (diff) | |
| parent | 528e3bf8921372db9a97a9c624288e44f756188a (diff) | |
| download | tor-43f95e38abefced37ad24966d56298e972cebf81.tar tor-43f95e38abefced37ad24966d56298e972cebf81.tar.gz | |
Merge remote-tracking branch 'sysrqb/bug9950'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/confparse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/confparse.c b/src/or/confparse.c index f2ada4f42..c5400a651 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -392,7 +392,7 @@ config_assign_value(const config_format_t *fmt, void *options, "Interval in '%s %s' is malformed or out of bounds.", c->key, c->value); SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp)); - smartlist_clear(csv_str); + smartlist_free(csv_str); return -1; } csv_int = tor_malloc_zero(sizeof(int)); @@ -401,7 +401,7 @@ config_assign_value(const config_format_t *fmt, void *options, } SMARTLIST_FOREACH_END(str); SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp)); - smartlist_clear(csv_str); + smartlist_free(csv_str); break; case CONFIG_TYPE_LINELIST: |