From 75cdad558472781162a83439f3e6edb61d4d40e6 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Wed, 28 Nov 2001 22:07:30 +0000
Subject: More sprintf -> PyOS_snprintf.

---
 Modules/almodule.c     | 3 ++-
 Modules/posixmodule.c  | 6 +++---
 Modules/socketmodule.c | 3 ++-
 Modules/stropmodule.c  | 6 ++++--
 Python/thread_beos.h   | 5 +++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Modules/almodule.c b/Modules/almodule.c
index 9e26081..e9b2114 100644
--- a/Modules/almodule.c
+++ b/Modules/almodule.c
@@ -1519,7 +1519,8 @@ al_GetParams(PyObject *self, PyObject *args)
 	for (i = 0; i < npvs; i++) {
 		if (pvs[i].sizeOut < 0) {
 			char buf[32];
-			sprintf(buf, "problem with param %d", i);
+			PyOS_snprintf(buf, sizeof(buf),
+				      "problem with param %d", i);
 			PyErr_SetString(ErrorObject, buf);
 			goto error;
 		}
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 3340131..37c0f86 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2555,7 +2555,7 @@ _PyPopenCreateProcess(char *cmdstring,
 			x = i + strlen(s3) + strlen(cmdstring) + 1;
 			s2 = (char *)_alloca(x);
 			ZeroMemory(s2, x);
-			sprintf(s2, "%s%s%s", s1, s3, cmdstring);
+			PyOS_snprintf(s2, x, "%s%s%s", s1, s3, cmdstring);
 		}
 		else {
 			/*
@@ -2608,8 +2608,8 @@ _PyPopenCreateProcess(char *cmdstring,
 
 			s2 = (char *)_alloca(x);
 			ZeroMemory(s2, x);
-			sprintf(
-				s2,
+			PyOS_snprintf(
+				s2, x,
 				"%s \"%s%s%s\"",
 				modulepath,
 				s1,
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index eccee4d..db91d8b 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3089,7 +3089,8 @@ OS2init(void)
 	    return 1; /* Indicate Success */
     }
 
-    sprintf(reason, "OS/2 TCP/IP Error# %d", sock_errno());
+    PyOS_snprintf(reason, sizeof(reason),
+		  "OS/2 TCP/IP Error# %d", sock_errno());
     PyErr_SetString(PyExc_ImportError, reason);
 
     return 0;  /* Indicate Failure */
diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c
index 3c5de2b..54d444f 100644
--- a/Modules/stropmodule.c
+++ b/Modules/stropmodule.c
@@ -778,7 +778,8 @@ strop_atoi(PyObject *self, PyObject *args)
 		return NULL;
 	}
 	else if (errno != 0) {
-		sprintf(buffer, "atoi() literal too large: %.200s", s);
+		PyOS_snprintf(buffer, sizeof(buffer), 
+			      "atoi() literal too large: %.200s", s);
 		PyErr_SetString(PyExc_ValueError, buffer);
 		return NULL;
 	}
@@ -828,7 +829,8 @@ strop_atol(PyObject *self, PyObject *args)
 	while (*end && isspace(Py_CHARMASK(*end)))
 		end++;
 	if (*end != '\0') {
-		sprintf(buffer, "invalid literal for atol(): %.200s", s);
+		PyOS_snprintf(buffer, sizeof(buffer),
+			      "invalid literal for atol(): %.200s", s);
 		PyErr_SetString(PyExc_ValueError, buffer);
 		Py_DECREF(x);
 		return NULL;
diff --git a/Python/thread_beos.h b/Python/thread_beos.h
index 3f84347..74eab2e 100644
--- a/Python/thread_beos.h
+++ b/Python/thread_beos.h
@@ -123,7 +123,8 @@ long PyThread_start_new_thread( void (*func)(void *), void *arg )
 
 	/* We are so very thread-safe... */
 	this_thread = atomic_add( &thread_count, 1 );
-	sprintf( name, "python thread (%d)", this_thread );
+	PyOS_snprintf(name, sizeof(name),
+		      "python thread (%d)", this_thread );
 
 	tid = spawn_thread( (thread_func)func, name,
 	                    B_NORMAL_PRIORITY, arg );
@@ -222,7 +223,7 @@ PyThread_type_lock PyThread_allocate_lock( void )
 	}
 
 	this_lock = atomic_add( &lock_count, 1 );
-	sprintf( name, "python lock (%d)", this_lock );
+	PyOS_snprintf(name, sizeof(name), "python lock (%d)", this_lock);
 
 	retval = benaphore_create( name, lock );
 	if( retval != EOK ) {
-- 
cgit v0.12