sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-07-28 09:54:39 -04:00
parent 3205700bc4 eb677c5870
commit 75eaca4e81
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/test_hs.c
View File

@ -572,6 +572,7 @@ test_single_onion_poisoning(void *arg)
char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2"));
smartlist_t *services = smartlist_new(); smartlist_t *services = smartlist_new();
char *poison_path = NULL; char *poison_path = NULL;
char *err_msg = NULL;
/* No services, no service to verify, no problem! */ /* No services, no service to verify, no problem! */
mock_options->HiddenServiceSingleHopMode = 0; mock_options->HiddenServiceSingleHopMode = 0;
@ -607,7 +608,6 @@ test_single_onion_poisoning(void *arg)
/* Add port to service 1 */ /* Add port to service 1 */
service_1->ports = smartlist_new(); service_1->ports = smartlist_new();
service_2->ports = smartlist_new(); service_2->ports = smartlist_new();
char *err_msg = NULL;
rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ", rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ",
&err_msg); &err_msg);
tt_assert(port1); tt_assert(port1);
@ -806,6 +806,7 @@ test_single_onion_poisoning(void *arg)
rend_service_free(service_2); rend_service_free(service_2);
UNMOCK(get_options); UNMOCK(get_options);
tor_free(mock_options->DataDirectory); tor_free(mock_options->DataDirectory);
tor_free(err_msg);
} }
static rend_service_t * static rend_service_t *