Adding the new vm

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 8f4eb831c2eedfb97d80fa04d97f89511668e0fc..8332e7351d658b79f4e02bf11fa921f04d427e7b 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -254,7 +254,7 @@ void SV_SendServerinfo (client_t *client)
        client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool);
 
        MSG_WriteByte (&client->message, svc_print);
-       sprintf (message, "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc);
+       snprintf (message, sizeof (message), "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc);
        MSG_WriteString (&client->message,message);
 
        MSG_WriteByte (&client->message, svc_serverinfo);
@@ -1370,7 +1370,7 @@ void SV_UpdateToReliableMessages (void)
                        if (s == NULL)
                                s = "";
                        // point the string back at host_client->name to keep it safe
-                       strncpy(host_client->name, s, sizeof(host_client->name) - 1);
+                       strlcpy (host_client->name, s, sizeof (host_client->name));
                        sv_player->v->netname = PR_SetString(host_client->name);
                }
                if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)) && host_client->colors != val->_float)
@@ -1775,7 +1775,7 @@ void SV_SpawnServer (const char *server)
 
        memset (&sv, 0, sizeof(sv));
 
-       strcpy (sv.name, server);
+       strlcpy (sv.name, server, sizeof (sv.name));
 
 // load progs to get entity field count
        PR_LoadProgs ();
@@ -1824,8 +1824,8 @@ void SV_SpawnServer (const char *server)
 
        Mod_ClearUsed();
 
-       strcpy (sv.name, server);
-       sprintf (sv.modelname,"maps/%s.bsp", server);
+       strlcpy (sv.name, server, sizeof (sv.name));
+       snprintf (sv.modelname, sizeof (sv.modelname), "maps/%s.bsp", server);
        sv.worldmodel = Mod_ForName(sv.modelname, false, true, true);
        if (!sv.worldmodel)
        {