summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-01-04 06:21:06 +0000
committerRoger Dingledine <arma@torproject.org>2005-01-04 06:21:06 +0000
commitba7c74e7425f53490e7becfbf47cbe686448ad7e (patch)
tree77d2c25f9417b98b56c5b872d6fc4c5d0e1b6f52
parent6dd91de3bda3226fc7779c9251ed595ca0225aeb (diff)
downloadtor-ba7c74e7425f53490e7becfbf47cbe686448ad7e.tar.gz
tor-ba7c74e7425f53490e7becfbf47cbe686448ad7e.zip
bandaid: make Giorgos Pallas's dns assert bug not actually crash on him.
one day we should try to figure out what's actually going on here. svn:r3280
-rw-r--r--src/or/dns.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/dns.c b/src/or/dns.c
index 75a45170cf..ac24de2433 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -396,6 +396,11 @@ void dns_cancel_pending_resolve(char *address) {
return;
}
+ if (!resolve->pending_connections) {
+ /* XXX this should never trigger, but sometimes it does */
+ log_fn(LOG_WARN,"Bug: Address '%s' is pending but has no pending connections!", address);
+ return;
+ }
tor_assert(resolve->pending_connections);
/* mark all pending connections to fail */