[tor-commits] [tor/master] fixup! Allow bootstrapping networks to have Exit flags

[nickm at torproject.org]

commit e24df58245ff7956ecbaf3817006af6d12b807b1
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sat Nov 4 04:18:32 2017 +0100

    fixup! Allow bootstrapping networks to have Exit flags
---
 src/or/dirserv.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index e1a572ec1..eb2c75613 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1521,15 +1521,19 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil)
       continue;
 
     routerinfo_t *ri = node->ri;
-    /* resolve spurious clang shallow analysis null pointer errors */
-    tor_assert(ri);
-    node->is_exit = (!router_exit_policy_rejects_all(ri) &&
-                     exit_policy_is_general_exit(ri->exit_policy));
+    if (ri) {
+      node->is_exit = (!router_exit_policy_rejects_all(ri) &&
+                       exit_policy_is_general_exit(ri->exit_policy));
+    }
 
     if (router_counts_toward_thresholds(node, now, omit_as_sybil,
                                         require_mbw)) {
       const char *id = node->identity;
       uint32_t bw_kb;
+
+      /* resolve spurious clang shallow analysis null pointer errors */
+      tor_assert(ri);
+
       uptimes[n_active] = (uint32_t)real_uptime(ri, now);
       mtbfs[n_active] = rep_hist_get_stability(id, now);
       tks  [n_active] = rep_hist_get_weighted_time_known(id, now);