nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core/Chat: properly prevent crashes + cleaning (import from TrinityCore)

Browse Source 
- Closes #111
This commit is contained in:
ShinDarth
2016-08-24 01:14:28 +02:00
parent 17061cbbb4
commit d538b86a47
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/worldengine/nucleus/src/Debugging/Errors.h
View File

@@ -29,4 +29,10 @@ namespace Trinity
#define ASSERT WPAssert
template <typename T> inline T* ASSERT_NOTNULL(T* pointer)
{
ASSERT(pointer);
return pointer;
}
#endif

8
src/game/Chat/Chat.cpp
View File

@@ -246,9 +246,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
for (uint32 i = 0; i < table.size(); ++i)
{
if (table[i].Name == nullptr)
continue;
if (!hasStringAbbr(table[i].Name, cmd.c_str()))
continue;
@@ -257,9 +254,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
{
for (uint32 j = 0; j < table.size(); ++j)
{
if (table[j].Name == nullptr)
continue;
if (!hasStringAbbr(table[j].Name, cmd.c_str()))
continue;
@@ -355,7 +349,7 @@ bool ChatHandler::SetDataForCommandInTable(std::vector<ChatCommand>& table, char
for (uint32 i = 0; i < table.size(); i++)
{
// for data fill use full explicit command names
if (table[i].Name == nullptr || table[i].Name != cmd)
if (table[i].Name != cmd)
continue;
// select subcommand from child commands list (including "")

2
src/game/Chat/Chat.h
View File

@@ -28,7 +28,7 @@ class ChatCommand
public:
ChatCommand(char const* name, uint32 securityLevel, bool allowConsole, pHandler handler, std::string help, std::vector<ChatCommand> childCommands = std::vector<ChatCommand>())
: Name(name), SecurityLevel(securityLevel), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands)) { }
: Name(ASSERT_NOTNULL(name)), SecurityLevel(securityLevel), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands)) { }
char const* Name;
uint32 SecurityLevel;

6
src/game/Scripting/ScriptMgr.cpp
View File

@@ -962,6 +962,12 @@ std::vector<ChatCommand> ScriptMgr::GetChatCommands()
table.insert(table.end(), cmds.begin(), cmds.end());
}
// Sort commands in alphabetical order
std::sort(table.begin(), table.end(), [](const ChatCommand& a, const ChatCommand&b)
{
return strcmp(a.Name, b.Name) < 0;
});
return table;
}

5
src/scripts/Commands/cs_debug.cpp
View File

@@ -82,9 +82,8 @@ public:
};
static std::vector<ChatCommand> commandTable =
{
{ "debug", SEC_GAMEMASTER, true, nullptr, "", debugCommandTable },
{ "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", },
{ nullptr, SEC_PLAYER, false, nullptr, "", }
{ "debug", SEC_GAMEMASTER, true, nullptr, "", debugCommandTable },
{ "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", }
};
return commandTable;
}