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

Tweak fix for #8789 a bit; avoid double-close and add changes file

Browse Source
This commit is contained in:
Nick Mathewson 2013-05-24 12:23:21 -04:00
parent d25e77f2c3
commit b4b0063e48
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug8789 Normal file
View File

@ -0,0 +1,3 @@
o Code simplifications and refactoring:
- Clean up exit path from connection_listener_new. Closes bug
8789. Patch from Arlo Breault.

7
src/or/connection.c
View File

@ -940,7 +940,7 @@ connection_listener_new(const struct sockaddr *listensockaddr,
const port_cfg_t *port_cfg) const port_cfg_t *port_cfg)
{ {
listener_connection_t *lis_conn; listener_connection_t *lis_conn;
connection_t *conn; connection_t *conn = NULL;
tor_socket_t s = TOR_INVALID_SOCKET; /* the socket we're going to make */ tor_socket_t s = TOR_INVALID_SOCKET; /* the socket we're going to make */
or_options_t const *options = get_options(); or_options_t const *options = get_options();
#if defined(HAVE_PWD_H) && defined(HAVE_SYS_UN_H) #if defined(HAVE_PWD_H) && defined(HAVE_SYS_UN_H)
@ -1106,6 +1106,7 @@ connection_listener_new(const struct sockaddr *listensockaddr,
conn = TO_CONN(lis_conn); conn = TO_CONN(lis_conn);
conn->socket_family = listensockaddr->sa_family; conn->socket_family = listensockaddr->sa_family;
conn->s = s; conn->s = s;
s = TOR_INVALID_SOCKET; /* Prevent double-close */
conn->address = tor_strdup(address); conn->address = tor_strdup(address);
conn->port = gotPort; conn->port = gotPort;
tor_addr_copy(&conn->addr, &addr); tor_addr_copy(&conn->addr, &addr);
@ -1141,7 +1142,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
if (connection_add(conn) < 0) { /* no space, forget it */ if (connection_add(conn) < 0) { /* no space, forget it */
log_warn(LD_NET,"connection_add for listener failed. Giving up."); log_warn(LD_NET,"connection_add for listener failed. Giving up.");
connection_free(conn);
goto err; goto err;
} }
@ -1162,6 +1162,9 @@ connection_listener_new(const struct sockaddr *listensockaddr,
err: err:
if (SOCKET_OK(s)) if (SOCKET_OK(s))
tor_close_socket(s); tor_close_socket(s);
if (conn)
connection_free(conn);
return NULL; return NULL;
} }