yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove bad string splitting

Browse Source 
Thanks to Makpptfox at getmangos.eu for report
This commit is contained in:
Rochet2
2017-04-12 21:36:24 +03:00
parent ecad5370ef
commit d7ec5438a5
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PlayerHooks.cpp
View File

@@ -42,31 +42,20 @@ void Eluna::OnLearnTalents(Player* pPlayer, uint32 talentId, uint32 talentRank,
bool Eluna::OnCommand(Player* player, const char* text)
{
// If from console, player is NULL
std::string fullcmd(text);
if (!player || player->GetSession()->GetSecurity() >= SEC_ADMINISTRATOR)
{
char* creload = strtok((char*)text, " ");
char* celuna = strtok(NULL, "");
if (creload && celuna)
std::string reload = text;
std::transform(reload.begin(), reload.end(), reload.begin(), ::tolower);
if (reload.find("reload eluna") == 0)
{
std::string reload(creload);
std::string eluna(celuna);
std::transform(reload.begin(), reload.end(), reload.begin(), ::tolower);
if (reload == "reload")
{
std::transform(eluna.begin(), eluna.end(), eluna.begin(), ::tolower);
if (std::string("eluna").find(eluna) == 0)
{
ReloadEluna();
return false;
}
}
ReloadEluna();
return false;
}
}
START_HOOK_WITH_RETVAL(PLAYER_EVENT_ON_COMMAND, true);
Push(player);
Push(fullcmd);
Push(text);
return CallAllFunctionsBool(PlayerEventBindings, key, true);
}

18
ServerHooks.cpp
View File

@@ -35,9 +35,21 @@ bool Eluna::OnAddonMessage(Player* sender, uint32 type, std::string& msg, Player
START_HOOK_WITH_RETVAL(ADDON_EVENT_ON_MESSAGE, true);
Push(sender);
Push(type);
const char* c_msg = msg.c_str();
Push(strtok((char*)c_msg, "\t")); // prefix
Push(strtok(NULL, "")); // msg
auto delimeter_position = msg.find('\t');
if (delimeter_position == std::string::npos)
{
Push(msg); // prefix
Push(); // msg
}
else
{
std::string prefix = msg.substr(0, delimeter_position);
std::string content = msg.substr(delimeter_position + 1, std::string::npos);
Push(prefix);
Push(content);
}
if (receiver)
Push(receiver);
else if (guild)