[tor-commits] [tor/master] Fix a memory leak introduced by changes to test_options.c

[nickm at torproject.org]

commit bd518b9ab1815a28cbc43a03924182bbca2c4a12
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 21 18:28:08 2019 -0400

    Fix a memory leak introduced by changes to test_options.c
    
    Since the FirewallPorts smartlist is now initialized, we can't just
    overwrite it.
---
 src/test/test_options.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 6ea037d50..1f5c85b40 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1553,7 +1553,9 @@ test_options_validate__reachable_addresses(void *ignored)
   tdata = get_options_test_data("FascistFirewall 1\n"
                                 "ReachableDirAddresses *:81\n"
                                 "ReachableORAddresses *:444\n");
-  tdata->opt->FirewallPorts = smartlist_new();
+  tt_assert(tdata->opt->FirewallPorts);
+  SMARTLIST_FOREACH(tdata->opt->FirewallPorts, char *, cp, tor_free(cp));
+  smartlist_clear(tdata->opt->FirewallPorts);
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, 0);
 #if 0