From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 25 Nov 2011 22:21:11 +0000 (-0500)
Subject: Avoid a double-mark in connection_or_close_connection_cb
X-Git-Tag: tor-0.2.3.9-alpha~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=633071eb3bcf2c4106e93de28d727594bd23b1db;p=thirdparty%2Ftor.git

Avoid a double-mark in connection_or_close_connection_cb
---

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index cbdfa44581..e868b7b78d 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1159,10 +1159,12 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn)
 static void
 connection_or_close_connection_cb(void *_conn)
 {
-  or_connection_t *conn = _conn;
+  or_connection_t *or_conn = _conn;
+  connection_t *conn = TO_CONN(or_conn);
 
-  connection_stop_reading(TO_CONN(conn));
-  connection_mark_for_close(TO_CONN(conn));
+  connection_stop_reading(conn);
+  if (!conn->marked_for_close)
+    connection_mark_for_close(conn);
 }
 
 /** Move forward with the tls handshake. If it finishes, hand