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

Prevent nested command invocations in command-prompt 

For example, running "devel/send-key SELECT" in command-prompt would
blow up the stack by recursively calling submit()
develop
lethosor 2015-12-27 22:35:14 -05:00
parent c23ac50250
commit 2ef24a3daf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/command-prompt.cpp
Unescape Escape View File

@ -56,7 +56,7 @@ public:
df::building* getSelectedBuilding() { return Gui::getAnyBuilding(parent); } df::building* getSelectedBuilding() { return Gui::getAnyBuilding(parent); }
std::string getFocusString() { return "commandprompt"; } std::string getFocusString() { return "commandprompt"; }
viewscreen_commandpromptst(std::string entry):is_response(false) viewscreen_commandpromptst(std::string entry):is_response(false), submitted(false)
{ {
show_fps=gps->display_frames; show_fps=gps->display_frames;
gps->display_frames=0; gps->display_frames=0;
@ -127,6 +127,7 @@ protected:
std::list<std::pair<color_value,std::string> > responses; std::list<std::pair<color_value,std::string> > responses;
int cursor_pos; int cursor_pos;
int history_idx; int history_idx;
bool submitted;
bool is_response; bool is_response;
bool show_fps; bool show_fps;
int frame; int frame;
@ -194,6 +195,9 @@ void viewscreen_commandpromptst::submit()
Screen::dismiss(this); Screen::dismiss(this);
return; return;
} }
if(submitted)
return;
submitted = true;
prompt_ostream out(this); prompt_ostream out(this);
Core::getInstance().runCommand(out, get_entry()); Core::getInstance().runCommand(out, get_entry());
if(out.empty() && responses.empty()) if(out.empty() && responses.empty())