Expand list of illegal chars, plus PR feedback

Author: slurmlord

Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp

@@ -289,10 +289,12 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
 			}
 #endif
 
-			// We're the host, so first validate the name
-			if (wcschr(msg->name, L',') || wcschr(msg->name, L';') || wcschr(msg->name, L':'))
+			// TheSuperHackers @bugfix slurmlord 18/09/2025 need to validate the name of the connecting player before
+			// allowing them to join to prevent messing up the format of game state string
+			constexpr WideChar IllegalNameChars[] = L",:;|\f\n\r\t\v";
+			if (canJoin && (wcscspn(msg->name, IllegalNameChars) || wcsspn(msg->name, L" ") == wcslen(msg->name)))
 			{
-				// Commas, colons or semicolons should not be in a player name.
+				// Commas, colons, semicolons etc. should not be in a player name. It should also not consist of only space characters.
 				// If so, just deny with a duplicate name error (for backwards compatibility with retail)
 				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
 				reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
@@ -301,7 +303,7 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
 				canJoin = false;
 
 				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of illegal characters in the player name."));
-			}
+			}	
 
 			// Then see if the player has a duplicate name
 			for (player = 0; canJoin && player<MAX_SLOTS; ++player)

GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp

@@ -290,10 +290,12 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
 			}
 #endif
 
-			// We're the host, so first validate the name
-			if (wcschr(msg->name, L',') || wcschr(msg->name, L';') || wcschr(msg->name, L':'))
+			// TheSuperHackers @bugfix slurmlord 18/09/2025 need to validate the name of the connecting player before
+			// allowing them to join to prevent messing up the format of game state string
+			constexpr WideChar IllegalNameChars[] = L",:;|\f\n\r\t\v";
+			if (canJoin && (wcscspn(msg->name, IllegalNameChars) || wcsspn(msg->name, L" ") == wcslen(msg->name)))
 			{
-				// Commas, colons or semicolons should not be in a player name.
+				// Commas, colons, semicolons etc. should not be in a player name. It should also not consist of only space characters.
 				// If so, just deny with a duplicate name error (for backwards compatibility with retail)
 				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
 				reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;