[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] fix crash bug reported in flyspray 279.
Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or
Modified Files:
routerlist.c
Log Message:
fix crash bug reported in flyspray 279.
Index: routerlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -d -r1.483 -r1.484
--- routerlist.c 3 Apr 2006 11:24:14 -0000 1.483
+++ routerlist.c 4 Apr 2006 03:25:36 -0000 1.484
@@ -967,7 +967,7 @@ router_get_by_nickname(const char *nickn
continue;
rs = router_get_combined_status_by_digest(
router->cache_info.identity_digest);
- if (!rs->name_lookup_warned) {
+ if (rs && !rs->name_lookup_warned) {
rs->name_lookup_warned = 1;
any_unwarned = 1;
}
@@ -984,7 +984,7 @@ router_get_by_nickname(const char *nickn
log_warn(LD_CONFIG,
"There are multiple matches for the nickname \"%s\","
" but none is listed as named by the directory authories. "
- "Choosing one arbitrarily. If you meant one in particular, "
+ "Choosing one arbitrarily. If you meant one in particular, "
"you should say %s.", nickname, alternatives);
tor_free(alternatives);
}