From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 30 Mar 2012 14:14:31 +0000 (-0400)
Subject: Move router lookup to _after_ we assert that its argument is set
X-Git-Tag: tor-0.2.3.14-alpha~32^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=491ffa540fda6a9cd8d75aad7d20945a3ae1df65;p=thirdparty%2Ftor.git

Move router lookup to _after_ we assert that its argument is set

A previous commit in the 5527 branch had moved
router_get_mutable_by_digest(digest_rcvd) to happen before we did
tor_assert(digest_rcvd), which would have defeated the purpose of
the assert.
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index dfecbc8a09..11f235caf4 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3271,11 +3271,13 @@ dirserv_orconn_tls_done(const char *address,
                         uint16_t or_port,
                         const char *digest_rcvd)
 {
-  routerinfo_t *ri = router_get_mutable_by_digest(digest_rcvd);
+  routerinfo_t *ri;
   time_t now = time(NULL);
   tor_assert(address);
   tor_assert(digest_rcvd);
 
+  ri = router_get_mutable_by_digest(digest_rcvd);
+
   if (ri == NULL)
     return;