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

Cleanup local_address in protocol_edge.c

Browse source 
In line 131 local_address has been defined,
but the memory was never freed on return.
This commit is contained in:
thorkill 2015-07-04 03:21:01 +02:00
parent 92df36a610
commit abb24e9d71
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/protocol_edge.c
View file

@ -137,6 +137,7 @@ bool add_edge_h(connection_t *c, const char *request) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry", logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
"ADD_EDGE", c->name, c->hostname); "ADD_EDGE", c->name, c->hostname);
send_add_edge(c, e); send_add_edge(c, e);
sockaddrfree(&local_address);
return true; return true;
} else { } else {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry", logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
@ -151,9 +152,11 @@ bool add_edge_h(connection_t *c, const char *request) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry", logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
"ADD_EDGE", c->name, c->hostname); "ADD_EDGE", c->name, c->hostname);
send_add_edge(c, e); send_add_edge(c, e);
sockaddrfree(&local_address);
return true; return true;
} }
// Otherwise, just ignore it. // Otherwise, just ignore it.
sockaddrfree(&local_address);
return true; return true;
} else if(local_address.sa.sa_family) { } else if(local_address.sa.sa_family) {
// We learned a new local address for this edge. // We learned a new local address for this edge.
@ -166,8 +169,10 @@ bool add_edge_h(connection_t *c, const char *request) {
return true; return true;
} }
} else } else {
sockaddrfree(&local_address);
return true; return true;
}
} else if(from == myself) { } else if(from == myself) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist", logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
"ADD_EDGE", c->name, c->hostname); "ADD_EDGE", c->name, c->hostname);
@ -177,6 +182,7 @@ bool add_edge_h(connection_t *c, const char *request) {
e->to = to; e->to = to;
send_del_edge(c, e); send_del_edge(c, e);
free_edge(e); free_edge(e);
sockaddrfree(&local_address);
return true; return true;
} }