From 49b5e5cf9c3dcfd33081a09394854586f4dde2dd Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 30 Jan 2007 22:44:24 +0000 Subject: [PATCH] r11610@catbus: nickm | 2007-01-30 17:44:02 -0500 Fix a bug in our assertions related to removing recently-completed DNS lookup attempts on exit. It is okay to find a cache entry with the same name as a DONE entry, so long it is not the same struct as the DONE entry. svn:r9467 --- src/or/dns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dns.c b/src/or/dns.c index 1155f59994..40897d3076 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -324,8 +324,8 @@ dns_free_all(void) /* XXXX012 The hash lookups here could be quite slow; remove them * once we're happy. */ if (res->state == CACHE_STATE_DONE) { - cached_resolve_t *removed = HT_REMOVE(cache_map, &cache_root, res); - tor_assert(!removed); + cached_resolve_t *found = HT_FIND(cache_map, &cache_root, res); + tor_assert(!found || found != res); _free_cached_resolve(res); } else { cached_resolve_t *found = HT_FIND(cache_map, &cache_root, res);