Convert many uses of sprintf to snprintf or asprintf

ticket: 6200
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21258 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 13 insertions, 16 deletions

diff --git a/src/lib/crypto/vectors.c b/src/lib/crypto/vectors.c
index 27b6206c96..64a5071c07 100644
--- a/src/lib/crypto/vectors.c
+++ b/src/lib/crypto/vectors.c
@@ -129,10 +129,10 @@ test_mit_des_s2k ()
 	sd.data = (char *) s;
 
 	assert (strlen (s) + 4 < sizeof (buf));
-	sprintf (buf, "\"%s\"", s);
+	snprintf (buf, sizeof (buf), "\"%s\"", s);
 	printf (  "salt:     %-25s", buf);
 	printhex (strlen(s), s);
-	sprintf (buf, "\"%s\"", p);
+	snprintf (buf, sizeof (buf), "\"%s\"", p);
 	printf ("\npassword: %-25s", buf);
 	printhex (strlen(p), p);
 	printf ("\n");
@@ -174,10 +174,10 @@ test_s2k (krb5_enctype enctype)
 	key.contents = key_contents;
 
 	assert (strlen (s) + 4 < sizeof (buf));
-	sprintf (buf, "\"%s\"", s);
+	snprintf (buf, sizeof(buf), "\"%s\"", s);
 	printf (  "salt:\t%s\n\t", buf);
 	printhex (strlen(s), s);
-	sprintf (buf, "\"%s\"", p);
+	snprintf (buf, sizeof(buf), "\"%s\"", p);
 	printf ("\npasswd:\t%s\n\t", buf);
 	printhex (strlen(p), p);
 	printf ("\n");
diff --git a/src/lib/krb5/krb/pkinit_apple_cert_store.c b/src/lib/krb5/krb/pkinit_apple_cert_store.c
index be0ea73abb..449f1cc990 100644
--- a/src/lib/krb5/krb/pkinit_apple_cert_store.c
+++ b/src/lib/krb5/krb/pkinit_apple_cert_store.c
@@ -594,7 +594,7 @@ char *krb5_pkinit_cert_hash_str(
     }
     cpOut = outstr;
     for(dex=0; dex<CC_SHA1_DIGEST_LENGTH; dex++) {
-	sprintf(cpOut, "%02X", (unsigned)(digest[dex]));
+	snprintf(cpOut, 3, "%02X", (unsigned)(digest[dex]));
 	cpOut += 2;
     }
     *cpOut = '\0';
diff --git a/src/lib/krb5/krb/pkinit_apple_utils.c b/src/lib/krb5/krb/pkinit_apple_utils.c
index dc006e912b..f539693fdc 100644
--- a/src/lib/krb5/krb/pkinit_apple_utils.c
+++ b/src/lib/krb5/krb/pkinit_apple_utils.c
@@ -301,13 +301,11 @@ krb5_error_code pkiKrbTimestampToStr(
 	utc->tm_min > 59 || utc->tm_sec > 59) {
 	return ASN1_BAD_GMTIME;
     }
-    outStr = (char *)malloc(16);
-    if(outStr == NULL) {
+    if (asprintf(&outStr, "%04d%02d%02d%02d%02d%02dZ",
+		 utc->tm_year + 1900, utc->tm_mon + 1,
+		 utc->tm_mday, utc->tm_hour, utc->tm_min, utc->tm_sec) < 0) {
 	return ENOMEM;
     }
-    sprintf(outStr, "%04d%02d%02d%02d%02d%02dZ",
-	utc->tm_year + 1900, utc->tm_mon + 1,
-	utc->tm_mday, utc->tm_hour, utc->tm_min, utc->tm_sec);
     *str = outStr;
     return 0;
 }
diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
index 47971d350f..7c39453235 100644
--- a/src/lib/krb5/krb/t_ser.c
+++ b/src/lib/krb5/krb/t_ser.c
@@ -418,7 +418,7 @@ ser_keytab_test(krb5_context kcontext, int verbose)
 	!(kret = ser_data(verbose, "> Resolved default keytab",
 			  (krb5_pointer) keytab, KV5M_KEYTAB)) &&
 	!(kret = krb5_kt_close(kcontext, keytab))) {
-	sprintf(ccname, "FILE:temp_kt_%d", (int) getpid());
+	snprintf(ccname, sizeof(ccname), "FILE:temp_kt_%d", (int) getpid());
 	if (!(kret = krb5_kt_resolve(kcontext, ccname, &keytab)) &&
 	    !(kret = ser_data(verbose, "> Resolved FILE keytab",
 			      (krb5_pointer) keytab, KV5M_KEYTAB)) &&
diff --git a/src/lib/krb5/os/t_gifconf.c b/src/lib/krb5/os/t_gifconf.c
index 92a49123a8..b0d9b7de2b 100644
--- a/src/lib/krb5/os/t_gifconf.c
+++ b/src/lib/krb5/os/t_gifconf.c
@@ -97,7 +97,7 @@ int main (void) {
 	    /* Solaris returns "Invalid argument" if the buffer is too
 	       small.  AIX and Linux return no error indication.  */
 	    int e = errno;
-	    sprintf (buffer, "SIOCGIFCONF(%d)", t);
+	    snprintf (buffer, sizeof(buffer), "SIOCGIFCONF(%d)", t);
 	    errno = e;
 	    perror (buffer);
 	    if (e == EINVAL)
diff --git a/src/lib/krb5/os/t_locate_kdc.c b/src/lib/krb5/os/t_locate_kdc.c
index 20e07af666..9cc845a829 100644
--- a/src/lib/krb5/os/t_locate_kdc.c
+++ b/src/lib/krb5/os/t_locate_kdc.c
@@ -37,7 +37,7 @@ static const char *stypename (int stype)
     case SOCK_RAW:
 	return "raw";
     default:
-	sprintf(buf, "?%d", stype);
+	snprintf(buf, sizeof(buf), "?%d", stype);
 	return buf;
     }
 }
diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
index e66f040a0f..662a8c51c6 100644
--- a/src/lib/rpc/unit-test/client.c
+++ b/src/lib/rpc/unit-test/client.c
@@ -139,7 +139,7 @@ main(argc, argv)
       */
      echo_arg = buf;
      for (i = 0; i < 3; i++) {
-	  sprintf(buf, "testing %d\n", i);
+	  snprintf(buf, sizeof(buf), "testing %d\n", i);
 
 	  echo_resp = rpc_test_echo_1(&echo_arg, clnt);
 	  if (echo_resp == NULL) {
diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c
index d4f0d8c6a0..657f7ef937 100644
--- a/src/lib/rpc/unit-test/server.c
+++ b/src/lib/rpc/unit-test/server.c
@@ -158,8 +158,7 @@ char **rpc_test_echo_1_svc(char **arg, struct svc_req *h)
 
      if (res)
 	  free(res);
-     res = (char *) malloc(strlen(*arg) + strlen("Echo: ") + 1);
-     sprintf(res, "Echo: %s", *arg);
+     asprintf(&res, "Echo: %s", *arg);
      return &res;
 }