game: fix UB when reading mapcycle

nillerusr · nillerusr · commit b6cb0c269696 · 2023-08-04T14:55:13.000+03:00
diff --git a/game/shared/multiplay_gamerules.cpp b/game/shared/multiplay_gamerules.cpp
@@ -1151,12 +1151,14 @@ ConVarRef suitcharger( "sk_suitcharger" );
 
 	void StripChar(char *szBuffer, const char cWhiteSpace )
 	{
+		char *src, *dst;
 
-		while ( char *pSpace = strchr( szBuffer, cWhiteSpace ) )
+		for (src = dst = szBuffer; *src != '\0'; src++)
 		{
-			char *pNextChar = pSpace + sizeof(char);
-			V_strcpy( pSpace, pNextChar );
+			*dst = *src;
+			if (*dst != cWhiteSpace) dst++;
 		}
+		*dst = '\0';
 	}
 
 	void CMultiplayRules::GetNextLevelName( char *pszNextMap, int bufsize, bool bRandom /* = false */ )

Original file line number	Diff line number	Diff line change
`@@ -1151,12 +1151,14 @@ ConVarRef suitcharger( "sk_suitcharger" );`
`1151`	`1151`
`1152`	`1152`	`void StripChar(char *szBuffer, const char cWhiteSpace )`
`1153`	`1153`	`{`
	`1154`	`+ char src, dst;`
`1154`	`1155`
`1155`		`- while ( char *pSpace = strchr( szBuffer, cWhiteSpace ) )`
	`1156`	`+ for (src = dst = szBuffer; *src != '\0'; src++)`
`1156`	`1157`	`{`
`1157`		`- char *pNextChar = pSpace + sizeof(char);`
`1158`		`- V_strcpy( pSpace, pNextChar );`
	`1158`	`+ dst = src;`
	`1159`	`+ if (*dst != cWhiteSpace) dst++;`
`1159`	`1160`	`}`
	`1161`	`+ *dst = '\0';`
`1160`	`1162`	`}`
`1161`	`1163`
`1162`	`1164`	`void CMultiplayRules::GetNextLevelName( char pszNextMap, int bufsize, bool bRandom / = false */ )`