[tor-commits] [tor/release-0.2.4] Fix 8833: crash bug from using NULL node->ri in dirserv.c

[arma at torproject.org]

commit 139d367f297575a59b96b64a633ed2b6988d60e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 5 18:52:53 2013 -0400

    Fix 8833: crash bug from using NULL node->ri in dirserv.c
    
    It appears that moria1 crashed because of one instance of this (the
    one in router_counts_toward_thresholds).  The other instance I fixed
    won't actually have broken anything, but I think it's more clear this
    way.
    
    Fixes bug 8833; bugfix on 0.2.4.12-alpha.
---
 changes/bug8833  |    3 +++
 src/or/dirserv.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug8833 b/changes/bug8833
new file mode 100644
index 0000000..681a861
--- /dev/null
+++ b/changes/bug8833
@@ -0,0 +1,3 @@
+  o Major bugfixes (directory authority):
+    - Fix a crash bug when building a consensus using an older consensus as
+      its basis. Fixes bug 8833. Bugfix on 0.2.4.12-alpha.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 66a2c14..16f297a 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1889,7 +1889,7 @@ router_counts_toward_thresholds(const node_t *node, time_t now,
 {
   /* Have measured bw? */
   int have_mbw =
-    dirserv_has_measured_bw(node->ri->cache_info.identity_digest);
+    dirserv_has_measured_bw(node->identity);
   uint64_t min_bw_kb = ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER_KB;
   const or_options_t *options = get_options();
 
@@ -1959,7 +1959,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl,
     if (router_counts_toward_thresholds(node, now, omit_as_sybil,
                                         require_mbw)) {
       routerinfo_t *ri = node->ri;
-      const char *id = ri->cache_info.identity_digest;
+      const char *id = node->identity;
       uint32_t bw_kb;
       node->is_exit = (!router_exit_policy_rejects_all(ri) &&
                        exit_policy_is_general_exit(ri->exit_policy));