From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 26 Oct 2014 18:09:03 +0000 (-0400)
Subject: Fix a crash bug introduced in 223d354e3.
X-Git-Tag: tor-0.2.6.1-alpha~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5fc7e3306f03c8a304dad89ada2280466d54c9a;p=thirdparty%2Ftor.git

Fix a crash bug introduced in 223d354e3.

Arma found this and commented on #11243.  Bug not in any released
version of Tor.
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 5748dfd5f4..4d117cb86d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2960,7 +2960,8 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei))
     goto done;
   }
   if (routerinfo_incompatible_with_extrainfo(ri, ei, sd, NULL)) {
-    r = (sd->extrainfo_is_bogus) ? ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS;
+    r = (ri->cache_info.extrainfo_is_bogus) ?
+      ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS;
     goto done;
   }