Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use luaL_loadbufferx to pass name directly to interpreter 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2022-11-20 13:53:41 +01:00
parent 6b6c069b22
commit 395e0792d8
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lua/ftl_lua.c
View File

@ -99,14 +99,15 @@ LUAMOD_API int luaopen_pihole(lua_State *L) {
return LUA_YIELD;
}
const char *script = inspect_lua;
static bool ftl_lua_load_embedded_script(lua_State *L, const char *name, const char *script, const bool make_global)
static bool ftl_lua_load_embedded_script(lua_State *L, const char *name, const char *script, const size_t script_len, const bool make_global)
{
if (luaL_dostring(L, script) != 0)
// Explanation:
// luaL_dostring(L, script) expands to (luaL_loadstring(L, script) || lua_pcall(L, 0, LUA_MULTRET, 0))
// luaL_loadstring(L, script) calls luaL_loadbuffer(L, s, strlen(s), s)
if (luaL_loadbufferx(L, script, script_len, name, NULL) || lua_pcall(L, 0, LUA_MULTRET, 0) != 0)
{
const char *lua_err = lua_tostring(L, -1);
logg("LUA error: %s", lua_err);
printf("LUA error while trying to import %s.lua: %s\n", name, lua_err);
return false;
}
@ -122,5 +123,5 @@ static bool ftl_lua_load_embedded_script(lua_State *L, const char *name, const c
// Load bundled libraries and make the available globally
void ftl_lua_init(lua_State *L)
{
ftl_lua_load_embedded_script(L, "inspect", inspect_lua, true);
ftl_lua_load_embedded_script(L, "inspect", inspect_lua, sizeof(inspect_lua), true);
}