fix an assert trigger in cvs: if a resolve request fails, and the circuit

has vanished in the meantime, then we would both mark it for close
(i.e. put it on the closeable list) and also immediately free it.

svn:r3759

diff --git a/src/or/dns.c b/src/or/dns.c
index d5aeb8208a31cac802bac6489c476f1a4a90d5ab..3913ef5df7ac40fd85b3944e4c5f03f1194d0d7b 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -277,7 +277,8 @@ int dns_resolve(connection_t *exitconn) {
         circ = circuit_get_by_conn(exitconn);
         if (circ)
           circuit_detach_stream(circ, exitconn);
-        connection_free(exitconn);
+        if (!exitconn->marked_for_close)
+          connection_free(exitconn);
         return -1;
     }
     tor_assert(0);