RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

lua: avoid rare memory leak in mp.join_path 

If lua_pushstring is OOM, then our joined path allocation is leaked. Use
autofree to ensure it's not leaked in case of Lua OOM.
This commit is contained in:
Guido Cella 2022-05-12 16:12:57 +02:00 committed by avih
parent 88120d4759
commit e686297ecf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
player/lua.c
View File

@ -1139,13 +1139,12 @@ static int script_split_path(lua_State *L)
return 2;
}
static int script_join_path(lua_State *L)
static int script_join_path(lua_State *L, void *tmp)
{
const char *p1 = luaL_checkstring(L, 1);
const char *p2 = luaL_checkstring(L, 2);
char *r = mp_path_join(NULL, p1, p2);
char *r = mp_path_join(tmp, p1, p2);
lua_pushstring(L, r);
talloc_free(r);
return 1;
}
@ -1240,7 +1239,7 @@ static const struct fn_entry utils_fns[] = {
AF_ENTRY(readdir),
FN_ENTRY(file_info),
FN_ENTRY(split_path),
FN_ENTRY(join_path),
AF_ENTRY(join_path),
AF_ENTRY(parse_json),
AF_ENTRY(format_json),
FN_ENTRY(get_env_list),