colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m-lua-scripting: check argument type is table to avoid crashing

Browse Source 
In conf_apply_rules, check input argument is a table before assuming it
is and potentially crashing.

Add check also in wplua_table_to_properties to avoid similar bugs.
This commit is contained in:
Pauli Virtanen
2023-10-13 22:35:41 +03:00
parent 4ad263b16c
commit b65f8884a5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/module-lua-scripting/api/api.c
View File

@@ -1675,6 +1675,7 @@ conf_apply_rules (lua_State *L)
ap = wp_properties_new_empty (); ap = wp_properties_new_empty ();
section = luaL_checkstring (L, 1); section = luaL_checkstring (L, 1);
luaL_checktype (L, 2, LUA_TTABLE);
mp = wplua_table_to_properties (L, 2); mp = wplua_table_to_properties (L, 2);
if (lua_isuserdata (L, 3)) { if (lua_isuserdata (L, 3)) {
WpSpaJson *v = wplua_checkboxed (L, 3, WP_TYPE_SPA_JSON); WpSpaJson *v = wplua_checkboxed (L, 3, WP_TYPE_SPA_JSON);

5
modules/module-lua-scripting/wplua/value.c
View File

@@ -17,6 +17,11 @@ wplua_table_to_properties (lua_State *L, int idx)
const gchar *key, *value; const gchar *key, *value;
int table = lua_absindex (L, idx); int table = lua_absindex (L, idx);
if (lua_type (L, table) != LUA_TTABLE) {
wp_critical ("skipping non-table value");
return p;
}
lua_pushnil(L); lua_pushnil(L);
while (lua_next (L, table) != 0) { while (lua_next (L, table) != 0) {
/* copy key & value to convert them to string */ /* copy key & value to convert them to string */