diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-03-30 10:14:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-03-30 10:14:31 -0400 |
| commit | 491ffa540fda6a9cd8d75aad7d20945a3ae1df65 (patch) | |
| tree | 058c8132d6c0ecc6e4e49a1d3b4b90bedf6da7eb | |
| parent | 3031def7268ce0cc6f3ab015c0df382295494bb9 (diff) | |
| download | tor-491ffa540fda6a9cd8d75aad7d20945a3ae1df65.tar.gz tor-491ffa540fda6a9cd8d75aad7d20945a3ae1df65.zip | |
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.
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |