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

luci-lib-jsonc: store large JSON integer values as Lua doubles

Browse source 
Fixes: #3293
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8da8f38bf9)
This commit is contained in:
Jo-Philipp Wich 2019-11-13 09:03:38 +01:00
parent 01fd1245f9
commit bd1e6d65a2
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ limitations under the License.
#define _GNU_SOURCE #define _GNU_SOURCE
#include <math.h> #include <math.h>
#include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <json-c/json.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) static void _json_to_lua(lua_State *L, struct json_object *obj)
{ {
int64_t v;
int n; int n;
switch (json_object_get_type(obj)) switch (json_object_get_type(obj))
@ -172,7 +174,12 @@ static void _json_to_lua(lua_State *L, struct json_object *obj)
break; break;
case json_type_int: 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; break;
case json_type_double: case json_type_double: