diff --git a/src/common/type/json.c b/src/common/type/json.c index 07031840a..2119a51c1 100644 --- a/src/common/type/json.c +++ b/src/common/type/json.c @@ -984,6 +984,10 @@ jsonFromVar(const Variant *var, unsigned int indent) { strCat(jsonStr, strPtr(jsonFromVar(varSub, indent))); } + else if (varType(varSub) == varTypeInt) + { + strCat(jsonStr, strPtr(jsonFromInt(varInt(varSub)))); + } else if (varType(varSub) == varTypeInt64) { strCat(jsonStr, strPtr(jsonFromInt64(varInt64(varSub)))); diff --git a/test/src/module/common/typeJsonTest.c b/test/src/module/common/typeJsonTest.c index e02c1db1d..a8f828cdc 100644 --- a/test/src/module/common/typeJsonTest.c +++ b/test/src/module/common/typeJsonTest.c @@ -289,6 +289,7 @@ testRun(void) TEST_ASSIGN(varListOuter, varNewVarLst(varLstNew()), "new variant list with keyValues"); varLstAdd(varVarLst(varListOuter), varNewStrZ("ASTRING")); varLstAdd(varVarLst(varListOuter), varNewInt64(9223372036854775807LL)); + varLstAdd(varVarLst(varListOuter), varNewInt(2147483647)); varLstAdd(varVarLst(varListOuter), varNewBool(true)); varLstAdd(varVarLst(varListOuter), varNewVarLst(varLstNew())); varLstAdd(varVarLst(varListOuter), NULL); @@ -296,7 +297,7 @@ testRun(void) TEST_ASSIGN(json, jsonFromVar(varListOuter, 0), "VariantList - no indent"); TEST_RESULT_STR(strPtr(json), - "[\"ASTRING\",9223372036854775807,true,[],null,{\"backup-info-size-delta\":1982702," + "[\"ASTRING\",9223372036854775807,2147483647,true,[],null,{\"backup-info-size-delta\":1982702," "\"backup-prior\":\"20161219-212741F_20161219-212803I\"," "\"backup-reference\":[\"20161219-212741F\",\"20161219-212741F_20161219-212803I\",null]," "\"backup-timestamp-start\":1482182951,\"checksum-page-error\":[1]," @@ -308,7 +309,7 @@ testRun(void) TEST_ASSIGN(json, jsonFromVar(varListOuter, 0), "VariantList - no indent - multiple elements"); TEST_RESULT_STR(strPtr(json), - "[\"ASTRING\",9223372036854775807,true,[],null,{\"backup-info-size-delta\":1982702," + "[\"ASTRING\",9223372036854775807,2147483647,true,[],null,{\"backup-info-size-delta\":1982702," "\"backup-prior\":\"20161219-212741F_20161219-212803I\"," "\"backup-reference\":[\"20161219-212741F\",\"20161219-212741F_20161219-212803I\",null]," "\"backup-timestamp-start\":1482182951,\"checksum-page-error\":[1]," @@ -324,6 +325,7 @@ testRun(void) "[\n" " \"ASTRING\",\n" " 9223372036854775807,\n" + " 2147483647,\n" " true,\n" " []\n,\n" " null,\n"