mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 14:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lua): don't leak memory on error

Browse Source
This commit is contained in:
bfredl
2022-07-01 19:17:15 +02:00
parent 9b4d0137b8
commit 0160ff6aa0
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/lua/stdlib.c
View File

@@ -300,7 +300,9 @@ int nlua_regex(lua_State *lstate)
}); });
if (ERROR_SET(&err)) { if (ERROR_SET(&err)) {
return luaL_error(lstate, "couldn't parse regex: %s", err.msg); nlua_push_errstr(lstate, "couldn't parse regex: %s", err.msg);
api_clear_error(&err);
return lua_error(lstate);
} }
assert(prog); assert(prog);
@@ -338,12 +340,14 @@ static dict_T *nlua_get_var_scope(lua_State *lstate)
dict = tabpage->tp_vars; dict = tabpage->tp_vars;
} }
} else { } else {
luaL_error(lstate, "invalid scope", err.msg); luaL_error(lstate, "invalid scope");
return NULL; return NULL;
} }
if (ERROR_SET(&err)) { if (ERROR_SET(&err)) {
luaL_error(lstate, "FAIL: %s", err.msg); nlua_push_errstr(lstate, "scoped variable: %s", err.msg);
api_clear_error(&err);
lua_error(lstate);
return NULL; return NULL;
} }
return dict; return dict;
@@ -537,3 +541,14 @@ void nlua_state_add_stdlib(lua_State *const lstate, bool is_thread)
lua_cjson_new(lstate); lua_cjson_new(lstate);
lua_setfield(lstate, -2, "json"); lua_setfield(lstate, -2, "json");
} }
/// like luaL_error, but allow cleanup
void nlua_push_errstr(lua_State *L, const char *fmt, ...)
{
va_list argp;
va_start(argp, fmt);
luaL_where(L, 1);
lua_pushvfstring(L, fmt, argp);
va_end(argp);
lua_concat(L, 2);
}