MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit recursive runCommand() calls to 20 

Addresses an issue with recursive aliases crashing (#701)
develop
lethosor 2017-07-12 16:28:21 -04:00
parent 070dfa1865
commit e3cd820fb1
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/Core.cpp
Unescape Escape View File

@ -135,6 +135,16 @@ struct Core::Private
}
};
struct CommandDepthCounter
{
static const int MAX_DEPTH = 20;
static thread_local int depth;
CommandDepthCounter() { depth++; }
~CommandDepthCounter() { depth--; }
bool ok() { return depth < MAX_DEPTH; }
};
thread_local int CommandDepthCounter::depth = 0;
void Core::cheap_tokenise(string const& input, vector<string> &output)
{
string *cur = NULL;
@ -651,6 +661,14 @@ void ls_helper(color_ostream &con, const PluginCommand &pcmd)
command_result Core::runCommand(color_ostream &con, const std::string &first_, vector<string> &parts)
{
std::string first = first_;
CommandDepthCounter counter;
if (!counter.ok())
{
con.printerr("Cannot invoke \"%s\": maximum command depth exceeded (%i)\n",
first.c_str(), CommandDepthCounter::MAX_DEPTH);
return CR_FAILURE;
}
command_result res;
if (!first.empty())
{