aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-12-18 22:59:47 +0000
committerRoger Dingledine <arma@torproject.org>2005-12-18 22:59:47 +0000
commit7cd46d7f951a724a897f6d799a06eae7040baefc (patch)
tree33b20e67d9870f2ba6bbb7751669a6b1df6cabf6 /src
parent34249e8861eb549d37600eccde632ac6142d57db (diff)
downloadtor-7cd46d7f951a724a897f6d799a06eae7040baefc.tar.gz
tor-7cd46d7f951a724a897f6d799a06eae7040baefc.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitbuild.c3
1 files changed, 2 insertions, 1 deletions
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);