From: Roger Dingledine <arma@torproject.org>
Date: Sun, 18 Dec 2005 22:59:47 +0000 (+0000)
Subject: fix a seg fault when you finish connecting to a server but
X-Git-Tag: tor-0.1.1.11-alpha~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cd46d7f951a724a897f6d799a06eae7040baefc;p=thirdparty%2Ftor.git

fix a seg fault when you finish connecting to a server but
at that moment you dump his server descriptor, and you also
happen to be logging at loglevel info.
(found by weasel)


svn:r5615
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 18210edafc..759f5938d3 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -584,7 +584,8 @@ circuit_send_next_onion_skin(circuit_t *circ)
     circ->cpath->state = CPATH_STATE_AWAITING_KEYS;
     circuit_set_state(circ, CIRCUIT_STATE_BUILDING);
     info(LD_CIRC,"First hop: finished sending %s cell to '%s'",
-         fast ? "CREATE_FAST" : "CREATE", router->nickname);
+         fast ? "CREATE_FAST" : "CREATE",
+         router ?  router->nickname : "<unnamed>");
   } else {
     tor_assert(circ->cpath->state == CPATH_STATE_OPEN);
     tor_assert(circ->state == CIRCUIT_STATE_BUILDING);