[or-cvs] Replace sprintf with snprintf

[Nick Mathewson]

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

Modified Files:
	log.c tortls.c util.c 
Log Message:
Replace sprintf with snprintf

Index: log.c
===================================================================
RCS file: /home/or/cvsroot/src/common/log.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- log.c	26 Oct 2004 21:48:40 -0000	1.55
+++ log.c	27 Oct 2004 05:53:07 -0000	1.56
@@ -142,7 +142,7 @@
 
 /** Helper: sends a message to the appropriate logfiles, at loglevel
  * <b>severity</b>.  If provided, <b>funcname</b> is prepended to the
- * message.  The actual message is derived as from vsprintf(format,ap).
+ * message.  The actual message is derived as from vsnprintf(format,ap).
  */
 static void
 logv(int severity, const char *funcname, const char *format, va_list ap)

Index: tortls.c
===================================================================
RCS file: /home/or/cvsroot/src/common/tortls.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- tortls.c	19 Oct 2004 18:17:12 -0000	1.69
+++ tortls.c	27 Oct 2004 05:53:07 -0000	1.70
@@ -294,12 +294,12 @@
   EVP_PKEY *pkey = NULL;
   tor_tls_context *result = NULL;
   X509 *cert = NULL, *idcert = NULL;
-  char nn2[1024];
+  char nn2[128];
   int client_only;
   SSL_CTX **ctx;
   if (!nickname)
     nickname = "null";
-  sprintf(nn2, "%s <identity>", nickname);
+  snprintf(nn2, sizeof(nn2), "%s <identity>", nickname);
 
   tor_tls_init();
 

Index: util.c
===================================================================
RCS file: /home/or/cvsroot/src/common/util.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- util.c	26 Oct 2004 21:48:41 -0000	1.152
+++ util.c	27 Oct 2004 05:53:07 -0000	1.153
@@ -1763,6 +1763,7 @@
   tor_assert(filename);
   /* XXXX Should eventually check for ~username/ */
   if (!strncmp(filename,"~/",2)) {
+    size_t len;
     const char *home = getenv("HOME");
     char *result;
     if (!home) {
@@ -1770,8 +1771,9 @@
       return NULL;
     }
     /* minus two characters for ~/, plus one for /, plus one for NUL. */
-    result = tor_malloc(strlen(home)+strlen(filename)+16);
-    sprintf(result,"%s/%s",home,filename+2);
+    len = strlen(home)+strlen(filename)+16;
+    result = tor_malloc(len);
+    snprintf(result,len,"%s/%s",home,filename+2);
     return result;
   } else {
     return tor_strdup(filename);