stop some more seg faults

svn:r2921

diff --git a/src/or/command.c b/src/or/command.c
index 021e12a4fca93b32cfca368b8e2b7b6ec353f4f7..e781a523eb5706387c74c64f172ec735ec8d78ae 100644 (file)
--- 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;
   }