From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 2 Mar 2001 22:14:49 +0000 (+0000)
Subject: a little cleanup, and eliminated a lightstyle buffer overflow
X-Git-Tag: RELEASE_0_2_0_RC1~854
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64543e8009b37d5f7f9bee8d257c47b961e73f17;p=xonotic%2Fdarkplaces.git

a little cleanup, and eliminated a lightstyle buffer overflow


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@169 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index 6929cb50..c086496f 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -913,7 +913,8 @@ void CL_ParseServerMessage (void)
 			i = MSG_ReadByte ();
 			if (i >= MAX_LIGHTSTYLES)
 				Host_Error ("svc_lightstyle > MAX_LIGHTSTYLES");
-			strcpy (cl_lightstyle[i].map,  MSG_ReadString());
+			strncpy (cl_lightstyle[i].map,  MSG_ReadString(), MAX_STYLESTRING - 1);
+			cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
 			cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
 			break;
 			
@@ -929,21 +930,21 @@ void CL_ParseServerMessage (void)
 		case svc_updatename:
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
-				Host_Error ("CL_ParseServerMessage: svc_updatename > MAX_SCOREBOARD");
+				Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD");
 			strcpy (cl.scores[i].name, MSG_ReadString ());
 			break;
 			
 		case svc_updatefrags:
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
-				Host_Error ("CL_ParseServerMessage: svc_updatefrags > MAX_SCOREBOARD");
+				Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD");
 			cl.scores[i].frags = MSG_ReadShort ();
 			break;			
 
 		case svc_updatecolors:
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
-				Host_Error ("CL_ParseServerMessage: svc_updatecolors > MAX_SCOREBOARD");
+				Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD");
 			cl.scores[i].colors = MSG_ReadByte ();
 			break;
 			
@@ -991,7 +992,7 @@ void CL_ParseServerMessage (void)
 			i = MSG_ReadByte ();
 			if (i < 0 || i >= MAX_CL_STATS)
 				Host_Error ("svc_updatestat: %i is invalid", i);
-			cl.stats[i] = MSG_ReadLong ();;
+			cl.stats[i] = MSG_ReadLong ();
 			break;
 			
 		case svc_spawnstaticsound: