luci-lib-jsonc: stringify int use json_object_new_int64 instead

[project/luci.git] / libs / luci-lib-jsonc / src / jsonc.c

diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c
index 9ff8520dbc43a2c7958b0882395ef15997254f33..74839dd4f57cadab356ade396d0645e6bf9ebccb 100644 (file)
--- 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 <math.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <json-c/json.h>
 
@@ -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:
@@ -361,7 +368,7 @@ static struct json_object * _lua_to_json_rec(lua_State *L, int index,
                ni = lua_tointeger(L, index);
 
                if (nd == ni)
-                       return json_object_new_int(nd);
+                       return json_object_new_int64(nd);
 
                return json_object_new_double(nd);