mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-30 06:22:00 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: connections: Make sure we free the connection on failure.

Browse Source 
In connect_server(), make sure we properly free a newly created connection
if we somehow fail, and it has not yet been attached to a conn_stream, or
it would lead to a memory leak.
This should appease coverity for backend.c, as reported in inssue #556.

This should be backported to 2.1, 2.0 and 1.9
This commit is contained in:
Olivier Houchard 2020-03-20 14:26:32 +01:00
parent 67b991d370
commit c0caac2cc8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend.c
View File

@ -1350,13 +1350,18 @@ int connect_server(struct stream *s)
srv_cs = NULL;
}
if (!srv_conn || !sockaddr_alloc(&srv_conn->dst))
if (!srv_conn || !sockaddr_alloc(&srv_conn->dst)) {
if (srv_conn)
conn_free(srv_conn);
return SF_ERR_RESOURCE;
}
if (!(s->flags & SF_ADDR_SET)) {
err = assign_server_address(s);
if (err != SRV_STATUS_OK)
if (err != SRV_STATUS_OK) {
conn_free(srv_conn);
return SF_ERR_INTERNAL;
}
}
/* copy the target address into the connection */
@ -1372,11 +1377,15 @@ int connect_server(struct stream *s)
else if (obj_type(s->target) == OBJ_TYPE_PROXY) {
/* proxies exclusively run on raw_sock right now */
conn_prepare(srv_conn, protocol_by_family(srv_conn->dst->ss_family), xprt_get(XPRT_RAW));
if (!(srv_conn->ctrl))
if (!(srv_conn->ctrl)) {
conn_free(srv_conn);
return SF_ERR_INTERNAL;
}
}
else
else {
conn_free(srv_conn);
return SF_ERR_INTERNAL; /* how did we get there ? */
}
srv_cs = si_alloc_cs(&s->si[1], srv_conn);
if (!srv_cs) {