if dns resolve is valid, but our exit policy rejects it or

the connect attempt fails immediately, we were trying to
double-remove it from the dns pending list.

i think this might have been The Bug.
(thanks weasel!)

svn:r1587

diff --git a/src/or/dns.c b/src/or/dns.c
index 85676e129fd6cd1bc7449d988d7e887534ff5140..c6b6b373f31fe6a827cff701b6200cb684d57ee6 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -376,9 +376,9 @@ static void dns_found_answer(char *address, uint32_t addr, char outcome) {
     pend = resolve->pending_connections;
     assert_connection_ok(pend->conn,time(NULL));
     pend->conn->addr = resolve->addr;
+    /* prevent double-remove */
+    pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED;
     if(resolve->state == CACHE_STATE_FAILED) {
-      /* prevent double-remove */
-      pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED;
       pendconn = pend->conn; /* don't pass complex things to the
                                 connection_mark_for_close macro */
       connection_mark_for_close(pendconn, END_STREAM_REASON_RESOLVEFAILED);