[or-cvs] Fix last patch

Nick Mathewson nickm at seul.org
Tue Nov 30 06:12:24 UTC 2004


Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv3179/src/or

Modified Files:
	connection_edge.c 
Log Message:
Fix last patch

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- connection_edge.c	30 Nov 2004 03:44:08 -0000	1.247
+++ connection_edge.c	30 Nov 2004 06:12:21 -0000	1.248
@@ -414,13 +414,14 @@
     if (strlen(s+1) == HEX_DIGEST_LEN) {
       conn->chosen_exit_name = tor_malloc(HEX_DIGEST_LEN+2);
       *(conn->chosen_exit_name) = '$';
-      strlcpy(conn->chosen_exit_name+1, HEX_DIGEST_LEN+1, s+1);
+      strlcpy(conn->chosen_exit_name+1, s+1, HEX_DIGEST_LEN+1);
     } else {
       conn->chosen_exit_name = tor_strdup(s+1);
     }
     *s = 0;
     if (!is_legal_nickname_or_hexdigest(conn->chosen_exit_name)) {
-      log_fn(LOG_WARN, "%s is not a legal exit node nickname; rejecting.");
+      log_fn(LOG_WARN, "%s is not a legal exit node nickname; rejecting.",
+             conn->chosen_exit_name);
       return -1;
     }
   }



More information about the tor-commits mailing list