From: Nick Mathewson Date: Mon, 11 Jun 2007 21:42:48 +0000 (+0000) Subject: r13352@catbus: nickm | 2007-06-11 17:42:45 -0400 X-Git-Tag: tor-0.2.0.3-alpha~223 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde82e737b7e049e7de2e3edd21e4ce88932f3d9;p=thirdparty%2Ftor.git r13352@catbus: nickm | 2007-06-11 17:42:45 -0400 Since desc_by_eid_map hold server descriptors, do not add routerinfo_ts. Bug found by weasel svn:r10561 --- diff --git a/ChangeLog b/ChangeLog index 63ee70a0e4..5790e56efc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,9 +18,13 @@ Changes in version 0.2.0.3-alpha - 2007-??-?? controller connections on Unix domain sockets on systems that support them. (Patch from Peter Palfrader.) + o Minor bugfixes (directory): + - Fix another crash bug related to extra-info caching. (Bug found by + Peter Palfrader.) [Bugfix on 0.2.0.2-alpha] + o Minor bugfixes (dns): - Fix a crash when DNSPort is set more than once. (Patch from Robert - Hogan.) + Hogan.) [Bugfix on 0.2.0.2-alpha] o Minor bugfixes (hidden services): - Stop tearing down the whole circuit when the user asks for a diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0c4438d655..7459de554c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2140,7 +2140,7 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old, if (!tor_digest_is_zero(ri_new->cache_info.extra_info_digest)) { digestmap_set(rl->desc_by_eid_map, ri_new->cache_info.extra_info_digest, - ri_new); + &ri_new->cache_info); } if (make_old && get_options()->DirPort &&