mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'andrea/bug11302'

Browse source
This commit is contained in:
Nick Mathewson 2014-07-16 16:58:41 +02:00
commit b408125288
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug11302 Normal file
View file

@ -0,0 +1,4 @@
o Bugfixes:
- Check for orconns and use connection_or_close_for_error() rather than
connection_mark_for_close() directly in the getsockopt() failure case
of connection_handle_write_impl(). Fixes bug #11302.

12
src/or/connection.c
View file

@ -3715,9 +3715,15 @@ connection_handle_write_impl(connection_t *conn, int force)
if (connection_state_is_connecting(conn)) {
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) {
log_warn(LD_BUG, "getsockopt() syscall failed");
if (CONN_IS_EDGE(conn))
connection_edge_end_errno(TO_EDGE_CONN(conn));
connection_mark_for_close(conn);
if (conn->type == CONN_TYPE_OR) {
or_connection_t *orconn = TO_OR_CONN(conn);
connection_or_close_for_error(orconn, 0);
} else {
if (CONN_IS_EDGE(conn)) {
connection_edge_end_errno(TO_EDGE_CONN(conn));
}
connection_mark_for_close(conn);
}
return -1;
}
if (e) {