mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r19613) -Fix [FS#3755]: possible invalid read when server moves client to spectators before he finishes joining

This commit is contained in:
smatz 2010-04-11 22:06:17 +00:00
parent 7590651aea
commit 24a60b77ec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/network_server.cpp
View File

@ -779,10 +779,12 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMPANY_PASSWORD)
char password[NETWORK_PASSWORD_LENGTH];
p->Recv_string(password, sizeof(password));
/* Check company password. Allow joining if we cleared the password meanwhile */
const NetworkClientInfo *ci = cs->GetInfo();
if (!StrEmpty(_network_company_states[ci->client_playas].password) &&
strcmp(password, _network_company_states[ci->client_playas].password) != 0) {
/* Check company password. Allow joining if we cleared the password meanwhile.
* Also, check the company is still valid - client could be moved to spectators
* in the middle of the authorization process */
CompanyID playas = cs->GetInfo()->client_playas;
if (Company::IsValidID(playas) && !StrEmpty(_network_company_states[playas].password) &&
strcmp(password, _network_company_states[playas].password) != 0) {
/* Password is invalid */
return SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD);
}