aboutsummaryrefslogtreecommitdiff
path: root/src/app/config/confparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-10-01 12:12:33 -0500
committerNick Mathewson <nickm@torproject.org>2018-10-01 12:12:33 -0500
commit43211c3a0c4b56d4100daf3a541250b953fb7230 (patch)
tree17ccca4c79f3a36804363a1430e5996a68d333b7 /src/app/config/confparse.c
parent58299b2927ffe4c7db7ddb6b3d44d1567c8a341f (diff)
parent8812f562a03234723871b893f269db09e78654fc (diff)
downloadtor-43211c3a0c4b56d4100daf3a541250b953fb7230.tar.gz
tor-43211c3a0c4b56d4100daf3a541250b953fb7230.zip
Merge remote-tracking branch 'public/bug27893'
Diffstat (limited to 'src/app/config/confparse.c')
-rw-r--r--src/app/config/confparse.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 045cbc94fe..35897935f3 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -1009,8 +1009,9 @@ config_dump(const config_format_t *fmt, const void *default_options,
result = smartlist_join_strings(elements, "", 0, NULL);
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
smartlist_free(elements);
- if (defaults_tmp)
- config_free(fmt, defaults_tmp);
+ if (defaults_tmp) {
+ fmt->free_fn(defaults_tmp);
+ }
return result;
}