Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-lib-jsonc: Ignore non-string-or-number keys in tables

Browse source 
Previously, the following caused a segmentation fault:

    json.stringify({[{}] = true})

This was caused by lua_tostring() returning NULL for anything but
strings and numbers, letting json_object_object_add crash.

This patch makes jsonc ignore all keys which have no string
representation altogether.

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
This commit is contained in:
Jan-Philipp Litza 2015-08-30 15:42:52 +02:00
parent 0d5070c510
commit e32a877aa4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/luci-lib-jsonc/src/jsonc.c
View file

@ -286,8 +286,9 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
lua_pushvalue(L, -2);
key = lua_tostring(L, -1);
json_object_object_add(obj, key,
_lua_to_json(L, lua_gettop(L) - 1));
if (key)
json_object_object_add(obj, key,
_lua_to_json(L, lua_gettop(L) - 1));
lua_pop(L, 2);
}