d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/flua/libjail: Allow empty params table

Browse Source 
The name or jid always gets added to the params, and that's enough to
avoid allocating a 0 length params array.

Reported by:	kevans
Reviewed by:	kevans
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D28778
This commit is contained in:
Ryan Moeller 2021-02-25 05:16:52 +00:00
parent 819760b35f
commit e175b519a6
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/flua/libjail/lua_jail.c
View File

@ -113,7 +113,6 @@ l_getparams(lua_State *L)
"expected a jail name (string) or id (integer)"); "expected a jail name (string) or id (integer)");
luaL_checktype(L, 2, LUA_TTABLE); luaL_checktype(L, 2, LUA_TTABLE);
params_count = 1 + lua_rawlen(L, 2); params_count = 1 + lua_rawlen(L, 2);
luaL_argcheck(L, params_count > 1, 2, "expected #params > 0");
flags = luaL_optinteger(L, 3, 0); flags = luaL_optinteger(L, 3, 0);
params = malloc(params_count * sizeof(struct jailparam)); params = malloc(params_count * sizeof(struct jailparam));
@ -236,7 +235,6 @@ l_setparams(lua_State *L)
lua_pushnil(L); lua_pushnil(L);
for (params_count = 1; lua_next(L, 2) != 0; ++params_count) for (params_count = 1; lua_next(L, 2) != 0; ++params_count)
lua_pop(L, 1); lua_pop(L, 1);
luaL_argcheck(L, params_count > 1, 2, "expected #params > 0");
flags = luaL_optinteger(L, 3, 0); flags = luaL_optinteger(L, 3, 0);