sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing ticket #75: Game names are now trimmed, and it is verified that the first character is printable.

Browse Source
This commit is contained in:
lotodore
2011-10-12 08:37:22 +00:00
parent a732baa71a
commit 75b84f9401
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+6 -1
View File
@@ -48,6 +48,7 @@
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/uuid/uuid.hpp> #include <boost/uuid/uuid.hpp>
#include <boost/algorithm/string.hpp>
#include <gsasl.h> #include <gsasl.h>
#define SERVER_MAX_NUM_LOBBY_SESSIONS 512 // Maximum number of idle users in lobby. #define SERVER_MAX_NUM_LOBBY_SESSIONS 512 // Maximum number of idle users in lobby.
@@ -1243,9 +1244,13 @@ ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr<SessionData> sess
GameData tmpData; GameData tmpData;
NetPacket::GetGameData(&newGame.gameInfo, tmpData); NetPacket::GetGameData(&newGame.gameInfo, tmpData);
string gameName(STL_STRING_FROM_OCTET_STRING(newGame.gameInfo.gameName)); string gameName(STL_STRING_FROM_OCTET_STRING(newGame.gameInfo.gameName));
// Always trim the game name.
boost::trim(gameName);
unsigned gameId = GetNextGameId(); unsigned gameId = GetNextGameId();
if (IsGameNameInUse(gameName)) { if (gameName.empty() || !isprint(gameName[0])) {
SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_BAD_NAME);
} else if (IsGameNameInUse(gameName)) {
SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_NAME_IN_USE); SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_NAME_IN_USE);
} else if (GetBanManager().IsBadGameName(gameName)) { } else if (GetBanManager().IsBadGameName(gameName)) {
SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_BAD_NAME); SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_BAD_NAME);