[or-cvs] backport the bandaid: make our latest dns assert bug not ac...

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/0091/tor/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	dns.c 
Log Message:
backport the bandaid: make our latest dns assert bug not actually crash.


Index: dns.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.126.2.1
retrieving revision 1.126.2.2
diff -u -d -r1.126.2.1 -r1.126.2.2
--- dns.c	3 Jan 2005 19:27:31 -0000	1.126.2.1
+++ dns.c	4 Jan 2005 06:21:42 -0000	1.126.2.2
@@ -396,6 +396,11 @@
     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 */