From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 26 Jan 2011 00:07:03 +0000 (-0500)
Subject: Fix double-mark bug when failing to init transparent connection
X-Git-Tag: tor-0.2.2.23-alpha~11^2~10^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85da676108f0de765301f961bc58aebd139a5564;p=thirdparty%2Ftor.git

Fix double-mark bug when failing to init transparent connection

Fixes part of bug 2279.  Bugfix on 0.1.2.1-alpha.
---

diff --git a/changes/bug2279 b/changes/bug2279
new file mode 100644
index 0000000000..b796cda761
--- /dev/null
+++ b/changes/bug2279
@@ -0,0 +1,5 @@
+  o Minor bugfixes
+    - Avoid a double mark-for-free warning when failing to attach a
+      transparent proxy connection.  Fixes bug 2279.  Bugfix on
+      Tor 0.1.2.1 alpha.
+
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;