From e10e9213868ffba8d62f550457a4620fed87c149 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 6 Sep 2006 20:22:05 +0000
Subject:  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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/or')

diff --git a/src/or/dns.c b/src/or/dns.c
index 7ef3d54326..530b5e8043 100644
--- a/src/or/dns.c
+++ b/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
-- 
cgit v1.2.3-54-g00ecf