From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Oct 2019 22:28:08 +0000 (-0400)
Subject: Fix a memory leak introduced by changes to test_options.c
X-Git-Tag: tor-0.4.3.1-alpha~282^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd518b9ab1815a28cbc43a03924182bbca2c4a12;p=thirdparty%2Ftor.git

Fix a memory leak introduced by changes to test_options.c

Since the FirewallPorts smartlist is now initialized, we can't just
overwrite it.
---

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 6ea037d506..1f5c85b405 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