[or-cvs] fix another rogue connection_free that was causing us troub...

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitlist.c 
Log Message:
fix another rogue connection_free that was causing us troubles
there are no doubt more lurking.


Index: circuitlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- circuitlist.c	19 Jan 2005 23:13:20 -0000	1.24
+++ circuitlist.c	31 Jan 2005 03:47:38 -0000	1.25
@@ -378,9 +378,8 @@
   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);