summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-04-18 21:42:39 -0400
committerNick Mathewson <nickm@torproject.org>2013-04-18 21:42:39 -0400
commitab3d5c049032651a9c9164262f9a8f81de9709d4 (patch)
tree442a115f6dc3f3ba50ea36e66e43c09a6d7b5f85 /src/or/config.c
parent1b5320bfe3d178c20357b9860087147a6cbb099b (diff)
parente35ca135282c6b833f51543988580bd860b49be6 (diff)
downloadtor-ab3d5c049032651a9c9164262f9a8f81de9709d4.tar.gz
tor-ab3d5c049032651a9c9164262f9a8f81de9709d4.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index b13fccad6a..cd9acf4f06 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -619,12 +619,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);
}