fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

fix a few more possible overruns

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2285 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-05-18 02:24:38 +00:00
parent 60d22a4d20
commit 3a8ae069c4
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/client/net_master.c
View file

@ -1021,7 +1021,7 @@ void MasterInfo_ProcessHTTP(char *name, qboolean success, int type)
info->special = type; info->special = type;
info->refreshtime = 0; 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; info->next = firstserver;
firstserver = info; firstserver = info;
@ -1487,7 +1487,7 @@ int CL_ReadServerInfo(char *msg, int servertype, qboolean favorite)
info->adr = net_from; 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; info->next = firstserver;
firstserver = info; firstserver = info;
@ -1723,7 +1723,7 @@ void CL_MasterListParse(int type, qboolean slashpad)
info->special = type; info->special = type;
info->refreshtime = 0; 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; info->next = last;
last = info; last = info;

6
engine/server/sv_ccmds.c
View file

@ -505,7 +505,7 @@ void SV_Map_f (void)
} }
else else
{ {
sprintf (expanded, "maps/%s.bsp", level); snprintf (expanded, sizeof(expanded), "maps/%s.bsp", level);
if (!COM_FCheckExists (expanded)) if (!COM_FCheckExists (expanded))
{ {
//doesn't exist, so try lowercase. Q3 does this. //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') if (level[i] >= 'A' && level[i] <= 'Z')
level[i] = level[i] - 'A' + 'a'; level[i] = level[i] - 'A' + 'a';
} }
sprintf (expanded, "maps/%s.bsp", level); snprintf (expanded, sizeof(expanded), "maps/%s.bsp", level);
if (!COM_FCheckExists (expanded)) if (!COM_FCheckExists (expanded))
{ {
Con_TPrintf (STL_CANTFINDMAP, expanded); Con_TPrintf (STL_CANTFINDMAP, expanded);
@ -1389,7 +1389,7 @@ void SV_Floodprotmsg_f (void)
Con_TPrintf(STL_FLOODPROTMESSAGESYNTAX); Con_TPrintf(STL_FLOODPROTMESSAGESYNTAX);
return; return;
} }
sprintf(fp_msg, "%s", Cmd_Argv(1)); snprintf(fp_msg, sizeof(fp_msg), "%s", Cmd_Argv(1));
} }

4
engine/server/sv_init.c
View file

@ -1165,9 +1165,9 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
if (val) if (val)
{ {
if (progstype == PROG_H2) 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 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) if (Cvar_Get("sv_readonlyworld", "1", 0, "DP compatability")->value)
ent->readonly = true; //lock it down! ent->readonly = true; //lock it down!

2
engine/server/sv_main.c
View file

@ -2526,7 +2526,7 @@ void SV_WriteIP_f (void)
int i; int i;
char *s; char *s;
sprintf (name, "listip.cfg"); strcpy (name, "listip.cfg");
Con_Printf ("Writing %s.\n", name); Con_Printf ("Writing %s.\n", name);