From: Roger Dingledine <arma@torproject.org>
Date: Sat, 20 Nov 2004 12:55:41 +0000 (+0000)
Subject: stop some more seg faults
X-Git-Tag: tor-0.0.9rc1~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73da4bad4641f5aa1cfcf679c624d46818147708;p=thirdparty%2Ftor.git

stop some more seg faults


svn:r2921
---

diff --git a/src/or/command.c b/src/or/command.c
index 021e12a4fc..e781a523eb 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -147,11 +147,11 @@ static void command_process_create_cell(cell_t *cell, connection_t *conn) {
    */
   if ((cell->circ_id & (1<<15)) && conn->circ_id_type == CIRC_ID_TYPE_HIGHER) {
     log_fn(LOG_INFO, "Got a high circuit ID from %s (%d); switching to low circuit IDs.",
-           conn->nickname, conn->s);
+           conn->nickname ? conn->nickname : "client", conn->s);
     conn->circ_id_type = CIRC_ID_TYPE_LOWER;
   } else if (!(cell->circ_id & (1<<15)) && conn->circ_id_type == CIRC_ID_TYPE_LOWER) {
     log_fn(LOG_INFO, "Got a low circuit ID from %s (%d); switching to high circuit IDs.",
-           conn->nickname, conn->s);
+           conn->nickname ? conn->nickname : "client", conn->s);
     conn->circ_id_type = CIRC_ID_TYPE_HIGHER;
   }