From: Roger Dingledine <arma@torproject.org>
Date: Mon, 31 Jan 2005 03:47:38 +0000 (+0000)
Subject: fix another rogue connection_free that was causing us troubles
X-Git-Tag: tor-0.1.0.1-rc~362
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7138f253515fbfb673045da3949297adc74ea23;p=thirdparty%2Ftor.git

fix another rogue connection_free that was causing us troubles
there are no doubt more lurking.


svn:r3478
---

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 4eabb9810b..5e17eb7a4e 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -378,9 +378,8 @@ int _circuit_mark_for_close(circuit_t *circ) {
   while (circ->resolving_streams) {
     conn = circ->resolving_streams;
     circ->resolving_streams = conn->next_stream;
-    connection_dns_remove(conn); /* remove it from resolve lists */
-    log_fn(LOG_INFO,"Freeing resolving-conn.");
-    connection_free(conn);
+    if (!conn->marked_for_close)
+      connection_mark_for_close(conn);
   }
   if (circ->p_conn)
     connection_send_destroy(circ->p_circ_id, circ->p_conn);