aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-06-11 21:42:48 +0000
committerNick Mathewson <nickm@torproject.org>2007-06-11 21:42:48 +0000
commitbde82e737b7e049e7de2e3edd21e4ce88932f3d9 (patch)
tree73e27b03d0cedbc41f6540e96ccfd102a45318be
parente91cab20dd5eb1789358ce5b7929bce93478f8cd (diff)
downloadtor-bde82e737b7e049e7de2e3edd21e4ce88932f3d9.tar
tor-bde82e737b7e049e7de2e3edd21e4ce88932f3d9.tar.gz
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
-rw-r--r--ChangeLog6
-rw-r--r--src/or/routerlist.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 63ee70a0e..5790e56ef 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 0c4438d65..7459de554 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 &&