Fix another crash bug found by Jaroslaw--it is possible for dns_resolve to mark a...

svn:r3623

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 65ec80aaf9626fda87f9456a1e9fd8b79ea6b4af..b45f75b1752f3cd10c27893b296a92735f4ca8bc 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -910,7 +910,8 @@ int connection_exit_begin_resolve(cell_t *cell, circuit_t *circ) {
       /* Connection freed; don't touch it. */
       return 0;
     case 1: /* The result was cached; a resolved cell was sent. */
-      connection_free(dummy_conn);
+      if (!dummy_conn->marked_for_close)
+        connection_free(dummy_conn);
       return 0;
     case 0: /* resolve added to pending list */
       dummy_conn->next_stream = circ->resolving_streams;