dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4521) - Fix: be consistent about the size of the player-name in MP. This hopefully fixes a crash on lesser OS's (eg Win98). Use ttd_strlcpy() to just copy over strings and properly terminate them because different implementations of snprintf() behave differently. Courtesy of TrueLight

Browse Source
This commit is contained in:
Darkvater
2006-04-22 09:46:31 +00:00
parent 395b44d15c
commit 580f364cc9
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
network.c
View File

@@ -92,11 +92,11 @@ NetworkClientState *NetworkFindClientStateFromIndex(uint16 client_index)
// if the user did not send it yet, Client #<no> is used.
void NetworkGetClientName(char *client_name, size_t size, const NetworkClientState *cs)
{
NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
if (ci->client_name[0] == '\0')
snprintf(client_name, size, "Client #%d", cs->index);
const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
if (*ci->client_name == '\0')
snprintf(client_name, size, "Client #%4d", cs->index);
else
snprintf(client_name, size, "%s", ci->client_name);
ttd_strlcpy(client_name, ci->client_name, size);
}
byte NetworkSpectatorCount(void)
@@ -545,7 +545,7 @@ void NetworkCloseClient(NetworkClientState *cs)
// We did not receive a leave message from this client...
NetworkErrorCode errorno = NETWORK_ERROR_CONNECTION_LOST;
char str[100];
char client_name[NETWORK_NAME_LENGTH];
char client_name[NETWORK_CLIENT_NAME_LENGTH];
NetworkClientState *new_cs;
NetworkGetClientName(client_name, sizeof(client_name), cs);