From 3a8ae069c4d1fddda875e7f4fcdcdcd00e03151d Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Thu, 18 May 2006 02:24:38 +0000
Subject: [PATCH] fix a few more possible overruns

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2285 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/net_master.c | 6 +++---
 engine/server/sv_ccmds.c   | 6 +++---
 engine/server/sv_init.c    | 4 ++--
 engine/server/sv_main.c    | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engine/client/net_master.c b/engine/client/net_master.c
index 47c12f3eb..4280ac332 100644
--- a/engine/client/net_master.c
+++ b/engine/client/net_master.c
@@ -1021,7 +1021,7 @@ void MasterInfo_ProcessHTTP(char *name, qboolean success, int type)
 			info->special = type;
 			info->refreshtime = 0;
 
-			sprintf(info->name, "%s", NET_AdrToString(info->adr));
+			snprintf(info->name, sizeof(info->name), "%s", NET_AdrToString(info->adr));
 
 			info->next = firstserver;
 			firstserver = info;
@@ -1487,7 +1487,7 @@ int CL_ReadServerInfo(char *msg, int servertype, qboolean favorite)
 
 		info->adr = net_from;
 
-		sprintf(info->name, "%s", NET_AdrToString(info->adr));
+		snprintf(info->name, sizeof(info->name), "%s", NET_AdrToString(info->adr));
 
 		info->next = firstserver;
 		firstserver = info;
@@ -1723,7 +1723,7 @@ void CL_MasterListParse(int type, qboolean slashpad)
 			info->special = type;
 			info->refreshtime = 0;
 
-			sprintf(info->name, "%s", NET_AdrToString(info->adr));
+			snprintf(info->name, sizeof(info->name), "%s", NET_AdrToString(info->adr));
 
 			info->next = last;
 			last = info;
diff --git a/engine/server/sv_ccmds.c b/engine/server/sv_ccmds.c
index c216503b0..7790ffba3 100644
--- a/engine/server/sv_ccmds.c
+++ b/engine/server/sv_ccmds.c
@@ -505,7 +505,7 @@ void SV_Map_f (void)
 	}
 	else
 	{
-		sprintf (expanded, "maps/%s.bsp", level);
+		snprintf (expanded, sizeof(expanded), "maps/%s.bsp", level);
 		if (!COM_FCheckExists (expanded))
 		{
 			//doesn't exist, so try lowercase. Q3 does this.
@@ -514,7 +514,7 @@ void SV_Map_f (void)
 				if (level[i] >= 'A' && level[i] <= 'Z')
 					level[i] = level[i] - 'A' + 'a';
 			}
-			sprintf (expanded, "maps/%s.bsp", level);
+			snprintf (expanded, sizeof(expanded), "maps/%s.bsp", level);
 			if (!COM_FCheckExists (expanded))
 			{
 				Con_TPrintf (STL_CANTFINDMAP, expanded);
@@ -1389,7 +1389,7 @@ void SV_Floodprotmsg_f (void)
 		Con_TPrintf(STL_FLOODPROTMESSAGESYNTAX);
 		return;
 	}
-	sprintf(fp_msg, "%s", Cmd_Argv(1));
+	snprintf(fp_msg, sizeof(fp_msg), "%s", Cmd_Argv(1));
 }
 
 
diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c
index cd0a4c447..32f6e749d 100644
--- a/engine/server/sv_init.c
+++ b/engine/server/sv_init.c
@@ -1165,9 +1165,9 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
 		if (val)
 		{
 			if (progstype == PROG_H2)
-				Q_snprintfz(sv.mapname, sizeof(sv.mapname), "%s", T_GetString(val->_float-1));
+				snprintf(sv.mapname, sizeof(sv.mapname), "%s", T_GetString(val->_float-1));
 			else
-				Q_snprintfz(sv.mapname, sizeof(sv.mapname), "%s", PR_GetString(svprogfuncs, val->string));
+				snprintf(sv.mapname, sizeof(sv.mapname), "%s", PR_GetString(svprogfuncs, val->string));
 		}
 		if (Cvar_Get("sv_readonlyworld", "1", 0, "DP compatability")->value)
 			ent->readonly = true;	//lock it down!
diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index 6ea5d5236..ea063d7b9 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -2526,7 +2526,7 @@ void SV_WriteIP_f (void)
 	int		i;
 	char *s;
 
-	sprintf (name, "listip.cfg");
+	strcpy (name, "listip.cfg");
 
 	Con_Printf ("Writing %s.\n", name);