diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-22 12:26:53 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-22 12:26:53 +0000 |
| commit | abb8fd86e78c57461f6729faafec5ea35ccd18a9 (patch) | |
| tree | c262a150967152852cb015ddcd12a08530aedf7f /crawl-ref/source/clua.cc | |
| parent | 609ccd171cbe8473c0a03c47392a12e72de2baaa (diff) | |
| download | crawl-ref-abb8fd86e78c57461f6729faafec5ea35ccd18a9.tar.gz crawl-ref-abb8fd86e78c57461f6729faafec5ea35ccd18a9.zip | |
Pull c_macro out of the code and into clua/macro.lua.
User-script dofile and loadfile check for "clua" anywhere in the file name and
refuse to load the file in that case; only core Crawl code can load Lua files
from clua/*.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1622 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/clua.cc')
| -rw-r--r-- | crawl-ref/source/clua.cc | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 5953355df2..2f21d7db44 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -216,17 +216,19 @@ int CLua::execstring(const char *s, const char *context) return err; } -bool CLua::is_path_safe(const char *s) +bool CLua::is_path_safe(std::string s, bool trusted) { - return (!strstr(s, "..") && shell_safe(s)); + lowercase(s); + return (s.find("..") == std::string::npos && shell_safe(s.c_str()) + && (trusted || s.find("clua") == std::string::npos)); } -int CLua::loadfile(lua_State *ls, const char *filename) +int CLua::loadfile(lua_State *ls, const char *filename, bool trusted) { if (!ls) return (-1); - if (!is_path_safe(filename)) + if (!is_path_safe(filename, trusted)) { lua_pushstring( ls, @@ -238,7 +240,7 @@ int CLua::loadfile(lua_State *ls, const char *filename) return (luaL_loadfile(ls, file.c_str())); } -int CLua::execfile(const char *filename) +int CLua::execfile(const char *filename, bool trusted) { if (sourced_files.find(filename) != sourced_files.end()) return 0; @@ -246,7 +248,7 @@ int CLua::execfile(const char *filename) sourced_files.insert(filename); lua_State *ls = state(); - int err = loadfile(ls, filename); + int err = loadfile(ls, filename, trusted); lua_call_throttle strangler(this); if (!err) err = lua_pcall(ls, 0, 0, 0); @@ -600,31 +602,7 @@ void CLua::load_chooks() void CLua::load_cmacro() { - static const char *c_macro = - "function c_macro(fn)" - " if fn == nil then" - " if c_macro_coroutine ~= nil then" - " local coret, mret" - " coret, mret = coroutine.resume(c_macro_coroutine)" - " if not coret or not mret then" - " c_macro_coroutine = nil" - " c_macro_name = nil" - " end" - " if not coret and mret then" - " error(mret)" - " end" - " return (coret and mret)" - " end" - " return false" - " end" - " if _G[fn] == nil or type(_G[fn]) ~= 'function' then" - " return false" - " end" - " c_macro_name = fn" - " c_macro_coroutine = coroutine.create(_G[fn]) " - " return c_macro() " - "end"; - execstring(c_macro, "base"); + execfile("clua/macro.lua", true); } ///////////////////////////////////////////////////////////////////// |