From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 4 Mar 2015 08:36:58 +0000 (+0000)
Subject: Fix overrun in fullinfo.
X-Git-Tag: xonotic-v0.8.1~15
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=4eff0041fa29b909267c0082a2dcc40bd767e414;p=xonotic%2Fdarkplaces.git

Fix overrun in fullinfo.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12176 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a1e4d829bdfdc78974582474f385254e0a7244c8
---

diff --git a/host_cmd.c b/host_cmd.c
index 75467251..10012cc9 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -2791,7 +2791,6 @@ static void Host_FullInfo_f (void) // credit: taken from QuakeWorld
 {
 	char key[512];
 	char value[512];
-	char *o;
 	const char *s;
 
 	if (Cmd_Argc() != 2)
@@ -2805,27 +2804,33 @@ static void Host_FullInfo_f (void) // credit: taken from QuakeWorld
 		s++;
 	while (*s)
 	{
-		o = key;
-		while (*s && *s != '\\')
-			*o++ = *s++;
-		*o = 0;
-
+		size_t len = strcspn(s, "\\");
+		if (len >= sizeof(key)) {
+			len = sizeof(key) - 1;
+		}
+		strlcpy(key, s, len + 1);
+		s += len;
 		if (!*s)
 		{
 			Con_Printf ("MISSING VALUE\n");
 			return;
 		}
+		++s; // Skip over backslash.
 
-		o = value;
-		s++;
-		while (*s && *s != '\\')
-			*o++ = *s++;
-		*o = 0;
-
-		if (*s)
-			s++;
+		len = strcspn(s, "\\");
+		if (len >= sizeof(value)) {
+			len = sizeof(value) - 1;
+		}
+		strlcpy(value, s, len + 1);
 
 		CL_SetInfo(key, value, false, false, false, false);
+
+		s += len;
+		if (!*s)
+		{
+			break;
+		}
+		++s; // Skip over backslash.
 	}
 }