commit 6ee9138576ae289c4ed726ddbb7b3f547f111f70 Author: Andrea Shepard andrea@torproject.org Date: Tue Apr 15 21:25:49 2014 -0700
Call connection_or_close_for_error() properly if write_to_buf() ever fails on an orconn --- changes/bug11304 | 5 +++++ src/or/connection.c | 6 ++++++ 2 files changed, 11 insertions(+)
diff --git a/changes/bug11304 b/changes/bug11304 new file mode 100644 index 0000000..2ea165f --- /dev/null +++ b/changes/bug11304 @@ -0,0 +1,5 @@ + o Bugfixes: + - If write_to_buf() in connection_write_to_buf_impl_() ever fails, + check if it's an or_connection_t and correctly call + connection_or_close_for_error() rather than connection_mark_for_close() + directly. Fixes bug #11304. diff --git a/src/or/connection.c b/src/or/connection.c index 1be4c45..5f9eecb 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4009,6 +4009,12 @@ connection_write_to_buf_impl_,(const char *string, size_t len, "write_to_buf failed. Closing circuit (fd %d).", (int)conn->s); circuit_mark_for_close(circuit_get_by_edge_conn(TO_EDGE_CONN(conn)), END_CIRC_REASON_INTERNAL); + } else if (conn->type == CONN_TYPE_OR) { + or_connection_t *orconn = TO_OR_CONN(conn); + log_warn(LD_NET, + "write_to_buf failed on an orconn; notifying of error " + "(fd %d)", (int)(conn->s)); + connection_or_close_for_error(orconn, 0); } else { log_warn(LD_NET, "write_to_buf failed. Closing connection (fd %d).",