r8729@Kushana: nickm | 2006-09-06 16:20:40 -0400

 Fix dns_cancel_pending_resolve() to realize pending resolves have expiry times, and should not be freed except when they fall off the pqueue.


svn:r8328

src/or/dns.c

@@ -638,7 +638,6 @@ dns_cancel_pending_resolve(char *address)
     return;
   }
   tor_assert(resolve->pending_connections);
-  tor_assert(! resolve->expire);
 
   /* mark all pending connections to fail */
   log_debug(LD_EXIT,
@@ -670,8 +669,8 @@ dns_cancel_pending_resolve(char *address)
             tmp ? tmp->address : "NULL", (void*)tmp);
   }
   tor_assert(tmp == resolve);
-  resolve->magic = 0xABABABAB;
-  tor_free(resolve);
+
+  resolve->state = CACHE_STATE_DONE;
 }
 
 /** Helper: adds an entry to the DNS cache mapping <b>address</b> to the ipv4