mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26488) -Codechange: perform the appropriate length checks when getting a client name

release/1.5
rubidium 2014-04-23 21:19:54 +00:00
parent a5274117bd
commit 160ad31028
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network_client.cpp
View File

@ -1231,7 +1231,7 @@ void NetworkUpdateClientName()
if (!_network_server) { if (!_network_server) {
MyClient::SendSetName(_settings_client.network.client_name); MyClient::SendSetName(_settings_client.network.client_name);
} else { } else {
if (NetworkFindName(_settings_client.network.client_name)) { if (NetworkFindName(_settings_client.network.client_name, lastof(_settings_client.network.client_name))) {
NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, CC_DEFAULT, false, ci->client_name, _settings_client.network.client_name); NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, CC_DEFAULT, false, ci->client_name, _settings_client.network.client_name);
strecpy(ci->client_name, _settings_client.network.client_name, lastof(ci->client_name)); strecpy(ci->client_name, _settings_client.network.client_name, lastof(ci->client_name));
NetworkUpdateClientInfo(CLIENT_ID_SERVER); NetworkUpdateClientInfo(CLIENT_ID_SERVER);

2
src/network/network_internal.h
View File

@ -168,7 +168,7 @@ void NetworkError(StringID error_string);
void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const char *name, const char *str = "", int64 data = 0); void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const char *name, const char *str = "", int64 data = 0);
uint NetworkCalculateLag(const NetworkClientSocket *cs); uint NetworkCalculateLag(const NetworkClientSocket *cs);
StringID GetNetworkErrorMsg(NetworkErrorCode err); StringID GetNetworkErrorMsg(NetworkErrorCode err);
bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]); bool NetworkFindName(char *new_name, const char *last);
const char *GenerateCompanyPasswordHash(const char *password, const char *password_server_id, uint32 password_game_seed); const char *GenerateCompanyPasswordHash(const char *password, const char *password_server_id, uint32 password_game_seed);
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */

10
src/network/network_server.cpp
View File

@ -941,7 +941,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_JOIN(Packet *p)
/* We need a valid name.. make it Player */ /* We need a valid name.. make it Player */
if (StrEmpty(name)) strecpy(name, "Player", lastof(name)); if (StrEmpty(name)) strecpy(name, "Player", lastof(name));
if (!NetworkFindName(name)) { // Change name if duplicate if (!NetworkFindName(name, lastof(name))) { // Change name if duplicate
/* We could not create a name for this client */ /* We could not create a name for this client */
return this->SendError(NETWORK_ERROR_NAME_IN_USE); return this->SendError(NETWORK_ERROR_NAME_IN_USE);
} }
@ -1443,7 +1443,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_SET_NAME(Packet
if (ci != NULL) { if (ci != NULL) {
/* Display change */ /* Display change */
if (NetworkFindName(client_name)) { if (NetworkFindName(client_name, lastof(client_name))) {
NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, CC_DEFAULT, false, ci->client_name, client_name); NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, CC_DEFAULT, false, ci->client_name, client_name);
strecpy(ci->client_name, client_name, lastof(ci->client_name)); strecpy(ci->client_name, client_name, lastof(ci->client_name));
NetworkUpdateClientInfo(ci->client_id); NetworkUpdateClientInfo(ci->client_id);
@ -1701,15 +1701,15 @@ static void NetworkAutoCleanCompanies()
/** /**
* Check whether a name is unique, and otherwise try to make it unique. * Check whether a name is unique, and otherwise try to make it unique.
* @param new_name The name to check/modify. * @param new_name The name to check/modify.
* @param last The last writeable element of the buffer.
* @return True if an unique name was achieved. * @return True if an unique name was achieved.
*/ */
bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]) bool NetworkFindName(char *new_name, const char *last)
{ {
bool found_name = false; bool found_name = false;
uint number = 0; uint number = 0;
char original_name[NETWORK_CLIENT_NAME_LENGTH]; char original_name[NETWORK_CLIENT_NAME_LENGTH];
/* We use NETWORK_CLIENT_NAME_LENGTH in here, because new_name is really a pointer */
strecpy(original_name, new_name, lastof(original_name)); strecpy(original_name, new_name, lastof(original_name));
while (!found_name) { while (!found_name) {
@ -1734,7 +1734,7 @@ bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH])
/* Something's really wrong when there're more names than clients */ /* Something's really wrong when there're more names than clients */
if (number++ > MAX_CLIENTS) break; if (number++ > MAX_CLIENTS) break;
snprintf(new_name, NETWORK_CLIENT_NAME_LENGTH, "%s #%d", original_name, number); seprintf(new_name, last, "%s #%d", original_name, number);
} }
} }