summaryrefslogtreecommitdiff
path: root/src/or/policies.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-09 16:25:17 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-09 16:25:17 -0500
commit6102efbee227394ae53727b292a62df5368ab4c6 (patch)
treecb228721c18b7caa966ed0d2b6a10c1046c4d60b /src/or/policies.c
parent631e3517e3baa99a83702e01bb7ef26667bd3dd8 (diff)
parentbb32c29986ecae6a213254dbfcd5c652caa4102c (diff)
downloadtor-6102efbee227394ae53727b292a62df5368ab4c6.tar.gz
tor-6102efbee227394ae53727b292a62df5368ab4c6.zip
Merge remote-tracking branch 'teor/fix-exitpolicy-leak'
Diffstat (limited to 'src/or/policies.c')
-rw-r--r--src/or/policies.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/policies.c b/src/or/policies.c
index 73245b50ab..7934d162ea 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1361,7 +1361,7 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options,
smartlist_t **result)
{
exit_policy_parser_cfg_t parser_cfg = 0;
- smartlist_t *configured_addresses = smartlist_new();
+ smartlist_t *configured_addresses = NULL;
int rv = 0;
/* Short-circuit for non-exit relays */
@@ -1371,6 +1371,8 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options,
return 0;
}
+ configured_addresses = smartlist_new();
+
/* Configure the parser */
if (or_options->IPv6Exit) {
parser_cfg |= EXIT_POLICY_IPV6_ENABLED;