nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-29 13:06:11 -04:00
commit b89a66e997
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/hs_descriptor.c
View File

@ -1134,6 +1134,7 @@ decode_link_specifiers(const char *encoded)
sizeof(hs_spec->u.legacy_id));
break;
default:
tor_free(hs_spec);
goto err;
}

11
src/test/test_hs_descriptor.c
View File

@ -173,6 +173,9 @@ test_link_specifier(void *arg)
ssize_t ret;
hs_desc_link_specifier_t spec;
smartlist_t *link_specifiers = smartlist_new();
char buf[256];
char *b64 = NULL;
link_specifier_t *ls = NULL;
(void) arg;
@ -182,9 +185,7 @@ test_link_specifier(void *arg)
/* Test IPv4 for starter. */
{
char *b64, buf[256];
uint32_t ipv4;
link_specifier_t *ls;
spec.type = LS_IPV4;
ret = tor_addr_parse(&spec.u.ap.addr, "1.2.3.4");
@ -211,9 +212,7 @@ test_link_specifier(void *arg)
/* Test IPv6. */
{
char *b64, buf[256];
uint8_t ipv6[16];
link_specifier_t *ls;
spec.type = LS_IPV6;
ret = tor_addr_parse(&spec.u.ap.addr, "[1:2:3:4::]");
@ -242,9 +241,7 @@ test_link_specifier(void *arg)
/* Test legacy. */
{
char *b64, buf[256];
uint8_t *id;
link_specifier_t *ls;
spec.type = LS_LEGACY_ID;
memset(spec.u.legacy_id, 'Y', sizeof(spec.u.legacy_id));
@ -270,6 +267,8 @@ test_link_specifier(void *arg)
}
done:
link_specifier_free(ls);
tor_free(b64);
smartlist_free(link_specifiers);
}