diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-06-21 02:15:13 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-10-31 15:41:32 +0100 |
| commit | b95648ae275a19492c54f8aca1ee4d7d58b8cb5e (patch) | |
| tree | f19ee30db1e1dbfaebb0c27de51e24de554d74e9 /src | |
| parent | 517a30d7c189b0530711f78508f9731e31fe5a53 (diff) | |
Core/Threading: Significantly reduced the severity of possible data race during player login
* This commit changes a data race on a pointer value to data race on integers (guid)
(cherry picked from commit dbe20510569e6bd4a26892be84289b5864350ea6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 8f63f848f9a..b1a043c4b5b 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -171,11 +171,11 @@ std::string WorldSession::GetPlayerInfo() const { std::ostringstream ss; - ss << "[Player: " << GetPlayerName() << " ("; - if (_player != NULL) - ss << _player->GetGUID().ToString() << ", "; + ss << "[Player: "; + if (!m_playerLoading && _player) + ss << _player->GetName() << ' ' << _player->GetGUID().ToString() << ", "; - ss << "Account: " << GetAccountId() << ")]"; + ss << "Account: " << GetAccountId() << "]"; return ss.str(); } diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index be5e851662e..0448059f43d 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -446,7 +446,7 @@ void WorldSocket::HandleAuthSessionCallback(std::shared_ptr<AuthSession> authSes // Must be done before WorldSession is created bool wardenActive = sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED); - if (wardenActive && account.OS != "Win" && account.OS != "Wn64" && account.OS != "Mc64") + if (wardenActive && account.OS != "Win" && account.OS != "OSX") { SendAuthResponseError(AUTH_REJECT); TC_LOG_ERROR("network", "WorldSocket::HandleAuthSession: Client %s attempted to log in using invalid client OS (%s).", address.c_str(), account.OS.c_str()); |