fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-05 21:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wplua: handle re-entrancy in _wplua_closure_marshal

Browse source 
* First of all, do not clear the stack... it's not necessary to do
  so and it causes trouble if this function is called from within
  itself, as it clears the stack of the previous context
* Then, do not stop/restart the garbage collector unless this is
  the base call

Fixes #73
This commit is contained in:
George Kiagiadakis 2021-10-15 14:58:27 +03:00
parent 7e0eeb485c
commit 5c23000c54
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/wplua/closure.c
View file

@ -70,6 +70,7 @@ _wplua_closure_marshal (GClosure *closure, GValue *return_value,
guint n_param_values, const GValue *param_values,
gpointer invocation_hint, gpointer marshal_data)
{
static int reentrant = 0;
lua_State *L = closure->data;
int func_ref = ((WpLuaClosure *) closure)->func_ref;
@ -77,9 +78,9 @@ _wplua_closure_marshal (GClosure *closure, GValue *return_value,
if (func_ref == LUA_NOREF || func_ref == LUA_REFNIL)
return;
/* clear the stack and stop the garbage collector for now */
lua_settop (L, 0);
lua_gc (L, LUA_GCSTOP, 0);
/* stop the garbage collector */
if (reentrant == 0)
lua_gc (L, LUA_GCSTOP, 0);
/* push the function */
lua_rawgeti (L, LUA_REGISTRYINDEX, func_ref);
@ -89,16 +90,20 @@ _wplua_closure_marshal (GClosure *closure, GValue *return_value,
wplua_gvalue_to_lua (L, &param_values[i]);
/* call in protected mode */
reentrant++;
int res = _wplua_pcall (L, n_param_values, return_value ? 1 : 0);
reentrant--;
/* handle the result */
if (res == LUA_OK && return_value && lua_gettop (L) >= 1)
wplua_lua_to_gvalue (L, 1, return_value);
if (res == LUA_OK && return_value) {
wplua_lua_to_gvalue (L, -1, return_value);
lua_pop (L, 1);
}
/* clear the stack and clean up */
lua_settop (L, 0);
/* clean up */
lua_gc (L, LUA_GCCOLLECT, 0);
lua_gc (L, LUA_GCRESTART, 0);
if (reentrant == 0)
lua_gc (L, LUA_GCRESTART, 0);
}
static void