summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-14 18:52:15 -0400
committerNick Mathewson <nickm@torproject.org>2011-03-14 18:52:15 -0400
commit06f026de6624ea0591b8d08da9c5c69ffa44568c (patch)
tree1f1c195c103c477d47a6bec5ef7e8faaa870f69c /src/or
parentb97d9abd0940037b249a1ee56724dbfed904263b (diff)
downloadtor-06f026de6624ea0591b8d08da9c5c69ffa44568c.tar.gz
tor-06f026de6624ea0591b8d08da9c5c69ffa44568c.zip
Check newconn, not conn, before marking newconn for close
This fixes bug 2757. It's a bugfix on 85da676108f0d.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index fd30ac8cb6..1894bc71ca 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1178,7 +1178,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
}
if (connection_init_accepted_conn(newconn, conn->type) < 0) {
- if (! conn->marked_for_close)
+ if (! newconn->marked_for_close)
connection_mark_for_close(newconn);
return 0;
}