From bd1e6d65a23a422dc6f98f0caea668bd7733760f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 13 Nov 2019 09:03:38 +0100 Subject: [PATCH] luci-lib-jsonc: store large JSON integer values as Lua doubles Fixes: #3293 Signed-off-by: Jo-Philipp Wich (cherry picked from commit 8da8f38bf97c925f6f113d3b4793edb23e7e0dc2) --- libs/luci-lib-jsonc/src/jsonc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c index 9ff8520db..2f56a4a68 100644 --- a/libs/luci-lib-jsonc/src/jsonc.c +++ b/libs/luci-lib-jsonc/src/jsonc.c @@ -17,6 +17,7 @@ limitations under the License. #define _GNU_SOURCE #include +#include #include #include @@ -145,6 +146,7 @@ static int json_parse_chunk(lua_State *L) static void _json_to_lua(lua_State *L, struct json_object *obj) { + int64_t v; int n; switch (json_object_get_type(obj)) @@ -172,7 +174,12 @@ static void _json_to_lua(lua_State *L, struct json_object *obj) break; case json_type_int: - lua_pushinteger(L, json_object_get_int(obj)); + v = json_object_get_int64(obj); + if (sizeof(lua_Integer) > sizeof(int32_t) || + (v >= INT32_MIN && v <= INT32_MAX)) + lua_pushinteger(L, (lua_Integer)v); + else + lua_pushnumber(L, (lua_Number)v); break; case json_type_double: -- 2.25.1