[or-cvs] stop some more seg faults

Roger Dingledine arma at seul.org
Sat Nov 20 12:55:43 UTC 2004


Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	command.c 
Log Message:
stop some more seg faults


Index: command.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/command.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- command.c	10 Nov 2004 20:14:37 -0000	1.72
+++ command.c	20 Nov 2004 12:55:41 -0000	1.73
@@ -147,11 +147,11 @@
    */
   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;
   }
 



More information about the tor-commits mailing list