third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-12 23:27:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

sslh-select: actually close socket on error in accept_new_connection

Browse Source 
Previously, it was leaked (and the client was left waiting for a timeout).
This commit is contained in:
Oleg Oshmyan 2017-09-09 00:44:24 +03:00
parent a3df50f31f
commit 684c9afcc6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sslh-select.c
View File

@ -93,11 +93,16 @@ int accept_new_connection(int listen_socket, struct connection *cnx[], int* cnx_
in_socket = accept(listen_socket, 0, 0);
CHECK_RES_RETURN(in_socket, "accept");
if (!fd_is_in_range(in_socket))
if (!fd_is_in_range(in_socket)) {
close(in_socket);
return -1;
}
res = set_nonblock(in_socket);
if (res == -1) return -1;
if (res == -1) {
close(in_socket);
return -1;
}
/* Find an empty slot */
for (free = 0; (free < *cnx_size) && ((*cnx)[free].q[0].fd != -1); free++) {
@ -109,6 +114,7 @@ int accept_new_connection(int listen_socket, struct connection *cnx[], int* cnx_
new = realloc(*cnx, (*cnx_size + cnx_num_alloc) * sizeof((*cnx)[0]));
if (!new) {
log_message(LOG_ERR, "unable to realloc -- dropping connection\n");
close(in_socket);
return -1;
}
*cnx = new;