aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-25 19:07:03 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-25 19:07:03 -0500
commit85da676108f0de765301f961bc58aebd139a5564 (patch)
treed60b9c537021efcd0a4633d6078656fd4eb270bf /src
parent9e7691b05c77261290b10ef433bf377f02a98705 (diff)
downloadtor-85da676108f0de765301f961bc58aebd139a5564.tar.gz
tor-85da676108f0de765301f961bc58aebd139a5564.zip
Fix double-mark bug when failing to init transparent connection
Fixes part of bug 2279. Bugfix on 0.1.2.1-alpha.
Diffstat (limited to 'src')
-rw-r--r--src/or/connection.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 8a21d81c58..55a9557ef6 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1178,7 +1178,8 @@ connection_handle_listener_read(connection_t *conn, int new_type)
}
if (connection_init_accepted_conn(newconn, conn->type) < 0) {
- connection_mark_for_close(newconn);
+ if (! conn->marked_for_close)
+ connection_mark_for_close(newconn);
return 0;
}
return 0;