From a0312f3590defdccf3d8f6e88203a4377ad9d63d Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 31 Jan 2005 01:27:49 +0000 Subject: [PATCH] don't double-detach a closing exit conn that's waiting for dns resolve svn:r3477 --- src/or/connection.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index 8e8505d1e9..854989c46d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -215,6 +215,7 @@ void connection_free_all(void) { */ void connection_about_to_close_connection(connection_t *conn) { + circuit_t *circ; assert(conn->marked_for_close); @@ -271,7 +272,9 @@ void connection_about_to_close_connection(connection_t *conn) break; case CONN_TYPE_EXIT: if (conn->state == EXIT_CONN_STATE_RESOLVING) { - circuit_detach_stream(circuit_get_by_conn(conn), conn); + circ = circuit_get_by_conn(conn); + if (circ) + circuit_detach_stream(circ, conn); connection_dns_remove(conn); } break;