From: Roger Dingledine <arma@torproject.org>
Date: Thu, 3 Aug 2006 04:22:25 +0000 (+0000)
Subject: fix a seg fault on exit for clients; and fix a comment.
X-Git-Tag: tor-0.1.2.1-alpha~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3152d44c3a56bdf85cab6d706f2f87a4894951a3;p=thirdparty%2Ftor.git

fix a seg fault on exit for clients; and fix a comment.


svn:r6969
---

diff --git a/src/or/dns.c b/src/or/dns.c
index 290bbc6c98..a61ff12de1 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -91,8 +91,7 @@ typedef struct cached_resolve_t {
   uint32_t magic;
   char address[MAX_ADDRESSLEN]; /**< The hostname to be resolved. */
   uint32_t addr; /**< IPv4 addr for <b>address</b>. */
-  uint8_t state; /**< 0 is pending; 1 means answer is valid; 2 means resolve
-                  * failed. */
+  uint8_t state; /**< Is this cached entry pending/done/valid/failed? */
   time_t expire; /**< Remove items from cache after this time. */
   uint32_t ttl; /**< What TTL did the nameserver tell us? */
   pending_connection_t *pending_connections;
@@ -264,7 +263,8 @@ dns_free_all(void)
     _free_cached_resolve(item);
   }
   HT_CLEAR(cache_map, &cache_root);
-  smartlist_free(cached_resolve_pqueue);
+  if (cached_resolve_pqueue)
+    smartlist_free(cached_resolve_pqueue);
   cached_resolve_pqueue = NULL;
 }