From: cypherpunks <cypherpunks@torproject.org>
Date: Fri, 4 Dec 2015 14:47:59 +0000 (+0100)
Subject: Fix a memory leak in the exit policy parsing code
X-Git-Tag: tor-0.2.8.1-alpha~169^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16bec0dfd9e5cdd0faf99587c2261b148bc58011;p=thirdparty%2Ftor.git

Fix a memory leak in the exit policy parsing code

This memory leak only occurs when the Tor instance is not an exit node.

Fixes code introduced in 10a6390deb3c9ff9fbd8078fc812abf6c77ad67f.
---

diff --git a/src/or/policies.c b/src/or/policies.c
index 126ba465df..7f71b0df22 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1350,7 +1350,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;
   int rv = 0;
 
   /* Short-circuit for non-exit relays */
@@ -1360,6 +1360,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;