mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-04 11:21:36 +02:00
Code Issues Projects Releases Wiki Activity

- added first round of security sandboxing for lua scripts (disable the os library)

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-11 05:17:37 +00:00
parent 8cc9c760e1
commit e3e3832070
4 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/glest_game/game/script_manager.cpp
View File

@@ -411,20 +411,36 @@ void ScriptManager::init(World* world, GameCamera *gameCamera, const XmlNode *ro
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
// Setup global functions and vars here
luaScript.beginCall("global");
luaScript.endCall();
//call startup function
if(this->rootNode == NULL) {
luaScript.beginCall("startup");
try {
// Setup global functions and vars here
luaScript.beginCall("global");
luaScript.endCall();
}
else {
loadGame(this->rootNode);
this->rootNode = NULL;
}
//call startup function
if(this->rootNode == NULL) {
luaScript.beginCall("startup");
luaScript.endCall();
}
else {
loadGame(this->rootNode);
this->rootNode = NULL;
}
}
catch(const megaglest_runtime_error &ex) {
string sErrBuf = "";
//if(ex.wantStackTrace() == true) {
char szErrBuf[8096]="";
sprintf(szErrBuf,"In [%s::%s %d]",__FILE__,__FUNCTION__,__LINE__);
sErrBuf = string(szErrBuf) + string("\nerror [") + string(ex.what()) + string("]\n");
//}
SystemFlags::OutputDebug(SystemFlags::debugError,sErrBuf.c_str());
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,sErrBuf.c_str());
ScriptManager_STREFLOP_Wrapper streflopWrapper;
messageQueue.push_back(ScriptManagerMessage(sErrBuf.c_str(), "error"));
onMessageBoxOk(false);
}
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}