[or-cvs] bandaid: make Giorgos Pallas"s dns assert bug not actually ...
Roger Dingledine
arma at seul.org
Tue Jan 4 06:21:08 UTC 2005
Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or
Modified Files:
dns.c
Log Message:
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.
Index: dns.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- dns.c 3 Jan 2005 19:07:25 -0000 1.128
+++ dns.c 4 Jan 2005 06:21:06 -0000 1.129
@@ -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 */
More information about the tor-commits
mailing list