mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 13:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Disable loadfile() without args in GUI mode

Browse Source 
Waiting for stdin input will hang the program.
This commit is contained in:
David Capello 2024-04-21 13:09:55 -03:00
parent f64e8065e7
commit 53bb6aceec
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/script/engine.cpp
View File

@ -129,6 +129,23 @@ int dofile(lua_State *L)
return dofilecont(L, 0, 0);
}
lua_CFunction orig_loadfile = nullptr;
int loadfile(lua_State *L)
{
ASSERT(orig_loadfile);
if (!orig_loadfile)
return luaL_error(L, "no original loadfile()?");
// fname is not optional if we are running in GUI mode as it blocks
// the program.
if (auto app = App::instance();
app && app->isGui() && !lua_isstring(L, 1)) {
return luaL_error(L, "loadfile() for stdin cannot be used running in GUI mode");
}
return orig_loadfile(L);
}
int os_clock(lua_State* L)
{
lua_pushnumber(L, luaClock.elapsed());
@ -226,10 +243,17 @@ Engine::Engine()
// Standard Lua libraries
luaL_openlibs(L);
// Overwrite Lua functions
// Overwrite Lua functions with custom implementations
lua_register(L, "print", print);
lua_register(L, "dofile", dofile);
if (!orig_loadfile) {
lua_getglobal(L, "loadfile");
orig_loadfile = lua_tocfunction(L, -1);
lua_pop(L, 1);
}
lua_register(L, "loadfile", loadfile);
lua_getglobal(L, "os");
for (const char* name : { "remove", "rename", "exit", "tmpname" }) {
lua_pushcfunction(L, unsupported);