nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

In tests, make sure that "ri" is freed on all paths.

Browse Source 
In Tor's tests, the tt_*() macros can call "goto done" on failure.
When that happens, we need to make sure that all of our allocated
memory still gets freed, or else Coverity will complain.
This commit is contained in:
Nick Mathewson 2019-08-26 18:27:55 -04:00
parent c8e69e63f9
commit 5eca338107
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test_address.c
View File

@ -1246,7 +1246,7 @@ test_address_tor_node_in_same_network_family(void *ignored)
}
#define CHECK_RI_ADDR(addr_str, rv) STMT_BEGIN \
routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); \
ri = tor_malloc_zero(sizeof(routerinfo_t)); \
tor_addr_t addr; \
tor_addr_parse(&addr, addr_str); \
ri->addr = tor_addr_to_ipv4h(&addr); \
@ -1258,7 +1258,7 @@ test_address_tor_node_in_same_network_family(void *ignored)
/* XXX: Here, we use a non-internal IPv4 as dirserv_router_has_valid_address()
* will check internal/null IPv4 first. */
#define CHECK_RI_ADDR6(addr_str, rv) STMT_BEGIN \
routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); \
ri = tor_malloc_zero(sizeof(routerinfo_t)); \
ri->addr = 16777217; /* 1.0.0.1 */ \
tor_addr_parse(&ri->ipv6_addr, addr_str); \
tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, rv); \
@ -1269,12 +1269,14 @@ static void
test_address_dirserv_router_addr_private(void *ignored)
{
(void)ignored;
/* A stub routerinfo structure, with only its address fields set. */
routerinfo_t *ri = NULL;
CHECK_RI_ADDR("1.0.0.1", 0);
CHECK_RI_ADDR("10.0.0.1", -1);
CHECK_RI_ADDR6("2600::1", 0);
CHECK_RI_ADDR6("fe80::1", -1);
done:
;
tor_free(ri);
}
#define ADDRESS_TEST(name, flags) \