Skip to content

Commit

Permalink
lua: stop setting bogus package path
Browse files Browse the repository at this point in the history
Scripts are not supposed to be able to "import" anything from mpv's
scripts directory, because all these files are loaded by mpv itself.
  • Loading branch information
wm4 committed Jan 26, 2020
1 parent 80423e5 commit bc1c024
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions player/lua.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,28 +273,6 @@ static int load_scripts(lua_State *L)
return 0;
}

static void set_path(lua_State *L)
{
void *tmp = talloc_new(NULL);

lua_getglobal(L, "package"); // package
lua_getfield(L, -1, "path"); // package path
const char *path = lua_tostring(L, -1);

char *newpath = talloc_strdup(tmp, path ? path : "");
char **luadir = mp_find_all_config_files(tmp, get_mpctx(L)->global, "scripts");
for (int i = 0; luadir && luadir[i]; i++) {
newpath = talloc_asprintf_append(newpath, ";%s",
mp_path_join(tmp, luadir[i], "?.lua"));
}

lua_pushstring(L, newpath); // package path newpath
lua_setfield(L, -3, "path"); // package path
lua_pop(L, 2); // -

talloc_free(tmp);
}

static int run_lua(lua_State *L)
{
struct script_ctx *ctx = lua_touserdata(L, -1);
Expand Down Expand Up @@ -348,9 +326,6 @@ static int run_lua(lua_State *L)

assert(lua_gettop(L) == 0);

set_path(L);
assert(lua_gettop(L) == 0);

// run this under an error handler that can do backtraces
lua_pushcfunction(L, error_handler); // errf
lua_pushcfunction(L, load_scripts); // errf fn
Expand Down

0 comments on commit bc1c024

Please sign in to comment.