summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-28 09:54:39 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-28 09:54:39 -0400
commit75eaca4e810fcabffea3b23b2ab9460fac020aa5 (patch)
treeeb47f0bfb421144f12d71126a0e5f489b5f5acde
parent3205700bc42bd3350defc569709b562a6adff0fd (diff)
parenteb677c5870ad67e0aa883d700f630c7a9ee99af3 (diff)
downloadtor-75eaca4e810fcabffea3b23b2ab9460fac020aa5.tar.gz
tor-75eaca4e810fcabffea3b23b2ab9460fac020aa5.zip
Merge branch 'maint-0.3.1' into release-0.3.1
-rw-r--r--src/test/test_hs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index b4817a21ea..5aae6c5b97 100644
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -572,6 +572,7 @@ test_single_onion_poisoning(void *arg)
char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2"));
smartlist_t *services = smartlist_new();
char *poison_path = NULL;
+ char *err_msg = NULL;
/* No services, no service to verify, no problem! */
mock_options->HiddenServiceSingleHopMode = 0;
@@ -607,7 +608,6 @@ test_single_onion_poisoning(void *arg)
/* Add port to service 1 */
service_1->ports = smartlist_new();
service_2->ports = smartlist_new();
- char *err_msg = NULL;
rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ",
&err_msg);
tt_assert(port1);
@@ -806,6 +806,7 @@ test_single_onion_poisoning(void *arg)
rend_service_free(service_2);
UNMOCK(get_options);
tor_free(mock_options->DataDirectory);
+ tor_free(err_msg);
}
static rend_service_t *