j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix lost pointer trails in get_known_addresses().

Browse source
This commit is contained in:
Roman Savelyev 2017-03-07 19:07:19 +01:00 committed by Guus Sliepen
parent 7a54fe5e88
commit ef661316f1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/net_socket.c
View file

@ -570,6 +570,7 @@ begin:
// Find edges pointing to this node, and use them to build a list of unique, known addresses. // Find edges pointing to this node, and use them to build a list of unique, known addresses.
static struct addrinfo *get_known_addresses(node_t *n) { static struct addrinfo *get_known_addresses(node_t *n) {
struct addrinfo *ai = NULL; struct addrinfo *ai = NULL;
struct addrinfo *oai = NULL;
for splay_each(edge_t, e, n->edge_tree) { for splay_each(edge_t, e, n->edge_tree) {
if(!e->reverse) if(!e->reverse)
@ -585,16 +586,15 @@ static struct addrinfo *get_known_addresses(node_t *n) {
if(found) if(found)
continue; continue;
struct addrinfo *nai = xzalloc(sizeof *nai); oai = ai;
if(ai) ai = xzalloc(sizeof *ai);
ai->ai_next = nai;
ai = nai;
ai->ai_family = e->reverse->address.sa.sa_family; ai->ai_family = e->reverse->address.sa.sa_family;
ai->ai_socktype = SOCK_STREAM; ai->ai_socktype = SOCK_STREAM;
ai->ai_protocol = IPPROTO_TCP; ai->ai_protocol = IPPROTO_TCP;
ai->ai_addrlen = SALEN(e->reverse->address.sa); ai->ai_addrlen = SALEN(e->reverse->address.sa);
ai->ai_addr = xmalloc(ai->ai_addrlen); ai->ai_addr = xmalloc(ai->ai_addrlen);
memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen); memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
ai->ai_next = oai;
} }
return ai; return ai;