From 9054f10d61a906ac3241d8960a07371bca634cb0 Mon Sep 17 00:00:00 2001 From: Christoph Winklhofer Date: Sun, 23 Mar 2025 19:39:46 +0100 Subject: [PATCH 1/3] json: Fix calculation of object size The calculation of the object size may be incorrect when the size of a field is smaller than the struct alignment. When such a struct is used in an array field, the decoded object contains wrong values. The alignment influences the object size. For example the following struct has a calculated object size of 8 bytes, however due to alignment the real size of the struct is 12 bytes: struct test_bool { bool b1; /* offset 0, size 1 */ /* 3-byte padding */ int i1; /* offset 4, size 4 */ bool b2; /* offset 8, size 1 */ /* 3-byte padding */ }; This commit changes the object size calculation and computes the size with the offset and size of the last field in the struct (rounded up by the struct alignment). Fixes: #85121 Signed-off-by: Christoph Winklhofer --- lib/utils/json.c | 8 +++++-- tests/lib/json/src/main.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/lib/utils/json.c b/lib/utils/json.c index de1f8017e1e4..25665eb8ec9b 100644 --- a/lib/utils/json.c +++ b/lib/utils/json.c @@ -635,13 +635,17 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr) size_t i; for (i = 0; i < descr->object.sub_descr_len; i++) { - total += get_elem_size(&descr->object.sub_descr[i]); - if (descr->object.sub_descr[i].align_shift > align_shift) { align_shift = descr->object.sub_descr[i].align_shift; } } + i = descr->object.sub_descr_len; + if (i > 0) { + total = descr->object.sub_descr[i - 1].offset + + get_elem_size(&descr->object.sub_descr[i - 1]); + } + return ROUND_UP(total, 1 << align_shift); } default: diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c index baf2e0edd840..eeceb4ba244f 100644 --- a/tests/lib/json/src/main.c +++ b/tests/lib/json/src/main.c @@ -205,6 +205,27 @@ static const struct json_obj_descr outer_descr[] = { num_elements, element_descr, ARRAY_SIZE(element_descr)) }; +struct test_alignment_nested { + bool bool1; + int int1; + bool bool2; +}; + +struct test_alignment_bool { + struct test_alignment_nested array[3]; + size_t num_elements; +}; + +static const struct json_obj_descr alignment_nested_descr[] = { + JSON_OBJ_DESCR_PRIM(struct test_alignment_nested, bool1, JSON_TOK_TRUE), + JSON_OBJ_DESCR_PRIM(struct test_alignment_nested, int1, JSON_TOK_NUMBER), + JSON_OBJ_DESCR_PRIM(struct test_alignment_nested, bool2, JSON_TOK_TRUE), +}; + +static const struct json_obj_descr alignment_bool_descr[] = { + JSON_OBJ_DESCR_OBJ_ARRAY(struct test_alignment_bool, array, 3, num_elements, + alignment_nested_descr, ARRAY_SIZE(alignment_nested_descr)) }; + ZTEST(lib_json_test, test_json_encoding) { struct test_struct ts = { @@ -1362,4 +1383,27 @@ ZTEST(lib_json_test, test_json_array_alignment) zassert_equal(o.array[1].int3, 6, "Element 1 int3 not decoded correctly"); } +ZTEST(lib_json_test, test_json_array_alignment_bool) +{ + char encoded[] = "{\"array\":[" + "{\"bool1\":true,\"int1\":1,\"bool2\":false}," + "{\"bool1\":true,\"int1\":2,\"bool2\":false}" + "]}"; + + struct test_alignment_bool o = { 0 }; + int64_t ret = json_obj_parse(encoded, sizeof(encoded) - 1, alignment_bool_descr, + ARRAY_SIZE(alignment_bool_descr), &o); + + zassert_false(ret < 0, "json_obj_parse returned error %d", ret); + zassert_equal(o.num_elements, 2, "Number of elements not decoded correctly"); + + zassert_equal(o.array[0].bool1, true, "Element 0 bool1 not decoded correctly"); + zassert_equal(o.array[0].int1, 1, "Element 0 int1 not decoded correctly"); + zassert_equal(o.array[0].bool2, false, "Element 0 bool2 not decoded correctly"); + + zassert_equal(o.array[1].bool1, true, "Element 1 bool1 not decoded correctly"); + zassert_equal(o.array[1].int1, 2, "Element 1 int1 not decoded correctly"); + zassert_equal(o.array[1].bool2, false, "Element 1 bool2 not decoded correctly"); +} + ZTEST_SUITE(lib_json_test, NULL, NULL, NULL, NULL, NULL); From a0dd3ec2c78b2627befc154b2514fdfa4854a445 Mon Sep 17 00:00:00 2001 From: Christoph Winklhofer Date: Mon, 24 Mar 2025 17:02:46 +0100 Subject: [PATCH 2/3] json: support parsing and serializing of strings with char arrays Support parsing and serializing of struct fields that are defined as a char array. Use the token JSON_TOK_STRING_BUF to parse and serialize a string for a char array, for example: struct foo { const char *str; char str_buf[30]; }; struct json_obj_descr foo[] = { JSON_OBJ_DESCR_PRIM(struct foo, str, JSON_TOK_STRING), JSON_OBJ_DESCR_PRIM(struct foo, str_buf, JSON_TOK_STRING_BUF), }; The struct 'json_obj_descr' now has an additional union member 'field' to store the size of the struct field, which is used with the token 'JSON_TOK_STRING_BUF' to determine the element size. Fixes: #65200 Signed-off-by: Christoph Winklhofer --- include/zephyr/data/json.h | 10 + lib/utils/json.c | 40 +++- tests/lib/json/src/main.c | 457 +++++++++++++++++++++++++++---------- 3 files changed, 386 insertions(+), 121 deletions(-) diff --git a/include/zephyr/data/json.h b/include/zephyr/data/json.h index 2e8182fd0884..f32a0ba34929 100644 --- a/include/zephyr/data/json.h +++ b/include/zephyr/data/json.h @@ -35,6 +35,7 @@ enum json_tokens { JSON_TOK_ARRAY_START = '[', JSON_TOK_ARRAY_END = ']', JSON_TOK_STRING = '"', + JSON_TOK_STRING_BUF = 's', JSON_TOK_COLON = ':', JSON_TOK_COMMA = ',', JSON_TOK_NUMBER = '0', @@ -108,6 +109,9 @@ struct json_obj_descr { const struct json_obj_descr *element_descr; size_t n_elements; } array; + struct { + size_t size; + } field; }; }; @@ -157,6 +161,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len, .field_name_len = sizeof(#field_name_) - 1, \ .type = type_, \ .offset = offsetof(struct_, field_name_), \ + .field = { \ + .size = SIZEOF_FIELD(struct_, field_name_) \ + }, \ } /** @@ -449,6 +456,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len, .field_name_len = sizeof(json_field_name_) - 1, \ .type = type_, \ .offset = offsetof(struct_, struct_field_name_), \ + .field = { \ + .size = SIZEOF_FIELD(struct_, struct_field_name_) \ + }, \ } /** diff --git a/lib/utils/json.c b/lib/utils/json.c index 25665eb8ec9b..f3a975e4d307 100644 --- a/lib/utils/json.c +++ b/lib/utils/json.c @@ -307,6 +307,7 @@ static int element_token(enum json_tokens token) case JSON_TOK_OBJECT_START: case JSON_TOK_ARRAY_START: case JSON_TOK_STRING: + case JSON_TOK_STRING_BUF: case JSON_TOK_NUMBER: case JSON_TOK_INT64: case JSON_TOK_UINT64: @@ -419,6 +420,20 @@ static int skip_field(struct json_obj *obj, struct json_obj_key_value *kv) return 0; } +static int decode_string_buf(const struct json_token *token, char *str, size_t size) +{ + size_t len = token->end - token->start; + + if (size <= len) { + return -EINVAL; + } + + strncpy(str, token->start, len); + str[len] = '\0'; + + return 0; +} + static int decode_num(const struct json_token *token, int32_t *num) { /* FIXME: strtod() is not available in newlib/minimal libc, @@ -516,6 +531,10 @@ static bool equivalent_types(enum json_tokens type1, enum json_tokens type2) return true; } + if (type1 == JSON_TOK_STRING && type2 == JSON_TOK_STRING_BUF) { + return true; + } + if (type1 == JSON_TOK_ARRAY_START && type2 == JSON_TOK_OBJ_ARRAY) { return true; } @@ -595,6 +614,11 @@ static int64_t decode_value(struct json_obj *obj, return 0; } + case JSON_TOK_STRING_BUF: { + char *str = field; + + return decode_string_buf(value, str, descr->field.size); + } default: return -EINVAL; } @@ -615,6 +639,8 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr) return sizeof(struct json_obj_token); case JSON_TOK_STRING: return sizeof(char *); + case JSON_TOK_STRING_BUF: + return descr->field.size; case JSON_TOK_TRUE: case JSON_TOK_FALSE: return sizeof(bool); @@ -1023,7 +1049,7 @@ static int arr_encode(const struct json_obj_descr *elem_descr, return append_bytes("]", 1, data); } -static int str_encode(const char **str, json_append_bytes_t append_bytes, +static int str_encode(const char *str, json_append_bytes_t append_bytes, void *data) { int ret; @@ -1033,7 +1059,7 @@ static int str_encode(const char **str, json_append_bytes_t append_bytes, return ret; } - ret = json_escape_internal(*str, append_bytes, data); + ret = json_escape_internal(str, append_bytes, data); if (!ret) { return append_bytes("\"", 1, data); } @@ -1143,7 +1169,12 @@ static int encode(const struct json_obj_descr *descr, const void *val, case JSON_TOK_FALSE: case JSON_TOK_TRUE: return bool_encode(ptr, append_bytes, data); - case JSON_TOK_STRING: + case JSON_TOK_STRING: { + const char **str = ptr; + + return str_encode(*str, append_bytes, data); + } + case JSON_TOK_STRING_BUF: return str_encode(ptr, append_bytes, data); case JSON_TOK_ARRAY_START: return arr_encode(descr->array.element_descr, ptr, @@ -1182,8 +1213,7 @@ int json_obj_encode(const struct json_obj_descr *descr, size_t descr_len, } for (i = 0; i < descr_len; i++) { - ret = str_encode((const char **)&descr[i].field_name, - append_bytes, data); + ret = str_encode(descr[i].field_name, append_bytes, data); if (ret < 0) { return ret; } diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c index eeceb4ba244f..479b2ea7f867 100644 --- a/tests/lib/json/src/main.c +++ b/tests/lib/json/src/main.c @@ -13,12 +13,14 @@ struct test_nested { int nested_int; bool nested_bool; const char *nested_string; + char nested_string_buf[10]; int64_t nested_int64; uint64_t nested_uint64; }; struct test_struct { const char *some_string; + char some_string_buf[10]; int some_int; bool some_bool; int64_t some_int64; @@ -39,6 +41,7 @@ struct test_struct { struct elt { const char *name; + const char name_buf[10]; int height; }; @@ -64,6 +67,8 @@ static const struct json_obj_descr nested_descr[] = { JSON_OBJ_DESCR_PRIM(struct test_nested, nested_bool, JSON_TOK_TRUE), JSON_OBJ_DESCR_PRIM(struct test_nested, nested_string, JSON_TOK_STRING), + JSON_OBJ_DESCR_PRIM(struct test_nested, nested_string_buf, + JSON_TOK_STRING_BUF), JSON_OBJ_DESCR_PRIM(struct test_nested, nested_int64, JSON_TOK_INT64), JSON_OBJ_DESCR_PRIM(struct test_nested, nested_uint64, @@ -72,6 +77,7 @@ static const struct json_obj_descr nested_descr[] = { static const struct json_obj_descr test_descr[] = { JSON_OBJ_DESCR_PRIM(struct test_struct, some_string, JSON_TOK_STRING), + JSON_OBJ_DESCR_PRIM(struct test_struct, some_string_buf, JSON_TOK_STRING_BUF), JSON_OBJ_DESCR_PRIM(struct test_struct, some_int, JSON_TOK_NUMBER), JSON_OBJ_DESCR_PRIM(struct test_struct, some_bool, JSON_TOK_TRUE), JSON_OBJ_DESCR_PRIM(struct test_struct, some_int64, @@ -101,6 +107,7 @@ static const struct json_obj_descr test_descr[] = { static const struct json_obj_descr elt_descr[] = { JSON_OBJ_DESCR_PRIM(struct elt, name, JSON_TOK_STRING), + JSON_OBJ_DESCR_PRIM(struct elt, name_buf, JSON_TOK_STRING_BUF), JSON_OBJ_DESCR_PRIM(struct elt, height, JSON_TOK_NUMBER), }; @@ -230,6 +237,7 @@ ZTEST(lib_json_test, test_json_encoding) { struct test_struct ts = { .some_string = "zephyr 123\uABCD", + .some_string_buf = "z 123\uABCD", .some_int = 42, .some_int64 = 1152921504606846977, .another_int64 = -2305843009213693937, @@ -240,6 +248,7 @@ ZTEST(lib_json_test, test_json_encoding) .nested_int = -1234, .nested_bool = false, .nested_string = "this should be escaped: \t", + .nested_string_buf = "esc: \t", .nested_int64 = 4503599627370496, .nested_uint64 = 18446744073709551610U, }, @@ -260,16 +269,18 @@ ZTEST(lib_json_test, test_json_encoding) .nested_int = 1234, .nested_bool = true, .nested_string = "no escape necessary", + .nested_string_buf = "no escape", .nested_int64 = 4503599627370496, .nested_uint64 = 18446744073709551610U, }, .nested_obj_array = { - {1, true, "true"}, - {0, false, "false"} + {1, true, "true", "true"}, + {0, false, "false", "false"} }, .obj_array_len = 2 }; char encoded[] = "{\"some_string\":\"zephyr 123\uABCD\"," + "\"some_string_buf\":\"z 123\uABCD\"," "\"some_int\":42,\"some_bool\":true," "\"some_int64\":1152921504606846977," "\"another_int64\":-2305843009213693937," @@ -278,6 +289,7 @@ ZTEST(lib_json_test, test_json_encoding) "\"some_nested_struct\":{\"nested_int\":-1234," "\"nested_bool\":false,\"nested_string\":" "\"this should be escaped: \\t\"," + "\"nested_string_buf\":\"esc: \\t\"," "\"nested_int64\":4503599627370496," "\"nested_uint64\":18446744073709551610}," "\"some_array\":[1,4,8,16,32]," @@ -287,11 +299,12 @@ ZTEST(lib_json_test, test_json_encoding) "\"4nother_ne$+\":{\"nested_int\":1234," "\"nested_bool\":true," "\"nested_string\":\"no escape necessary\"," + "\"nested_string_buf\":\"no escape\"," "\"nested_int64\":4503599627370496," "\"nested_uint64\":18446744073709551610}," "\"nested_obj_array\":[" - "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_int64\":0,\"nested_uint64\":0}," - "{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_int64\":0,\"nested_uint64\":0}]" + "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\",\"nested_int64\":0,\"nested_uint64\":0}," + "{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_string_buf\":\"false\",\"nested_int64\":0,\"nested_uint64\":0}]" "}"; char buffer[sizeof(encoded)]; int ret; @@ -312,6 +325,7 @@ ZTEST(lib_json_test, test_json_decoding) { struct test_struct ts; char encoded[] = "{\"some_string\":\"zephyr 123\\uABCD456\"," + "\"some_string_buf\":\"z\\uABCD\"," "\"some_int\":\t42\n," "\"some_bool\":true \t " "\n" @@ -324,6 +338,7 @@ ZTEST(lib_json_test, test_json_decoding) "\"nested_int\":-1234,\n\n" "\"nested_bool\":false,\t" "\"nested_string\":\"this should be escaped: \\t\"," + "\"nested_string_buf\":\"esc: \\t\"," "\"nested_int64\":9223372036854775807," "\"extra_nested_array\":[0,-1]}," "\"extra_struct\":{\"nested_bool\":false}," @@ -335,10 +350,11 @@ ZTEST(lib_json_test, test_json_decoding) "\"4nother_ne$+\":{\"nested_int\":1234," "\"nested_bool\":true," "\"nested_string\":\"no escape necessary\"," + "\"nested_string_buf\":\"no escape\"," "\"nested_int64\":-9223372036854775806}," "\"nested_obj_array\":[" - "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\"}," - "{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\"}]" + "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\"}," + "{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_string_buf\":\"false\"}]" "}\n"; const int expected_array[] = { 11, 22, 33, 45, 299 }; const int expected_other_array[] = { 2, 3, 5, 7 }; @@ -352,6 +368,8 @@ ZTEST(lib_json_test, test_json_decoding) zassert_str_equal(ts.some_string, "zephyr 123\\uABCD456", "String not decoded correctly"); + zassert_str_equal(ts.some_string_buf, "z\\uABCD", + "String (array) not decoded correctly"); zassert_equal(ts.some_int, 42, "Positive integer not decoded correctly"); zassert_equal(ts.some_bool, true, "Boolean not decoded correctly"); zassert_equal(ts.some_int64, -4611686018427387904, @@ -367,6 +385,9 @@ ZTEST(lib_json_test, test_json_decoding) zassert_str_equal(ts.some_nested_struct.nested_string, "this should be escaped: \\t", "Nested string not decoded correctly"); + zassert_str_equal(ts.some_nested_struct.nested_string_buf, + "esc: \\t", + "Nested string-array not decoded correctly"); zassert_equal(ts.some_array_len, 5, "Array doesn't have correct number of items"); zassert_true(!memcmp(ts.some_array, expected_array, @@ -390,6 +411,9 @@ ZTEST(lib_json_test, test_json_decoding) zassert_str_equal(ts.xnother_nexx.nested_string, "no escape necessary", "Named nested string not decoded correctly"); + zassert_str_equal(ts.xnother_nexx.nested_string_buf, + "no escape", + "Named nested string-array not decoded correctly"); zassert_equal(ts.obj_array_len, 2, "Array of objects does not have correct number of items"); zassert_equal(ts.nested_obj_array[0].nested_int, 1, @@ -398,12 +422,16 @@ ZTEST(lib_json_test, test_json_decoding) "Boolean value in first object array element not decoded correctly"); zassert_str_equal(ts.nested_obj_array[0].nested_string, "true", "String in first object array element not decoded correctly"); + zassert_str_equal(ts.nested_obj_array[0].nested_string_buf, "true", + "String buffer in first object array element not decoded correctly"); zassert_equal(ts.nested_obj_array[1].nested_int, 0, "Integer in second object array element not decoded correctly"); zassert_equal(ts.nested_obj_array[1].nested_bool, false, "Boolean value in second object array element not decoded correctly"); zassert_str_equal(ts.nested_obj_array[1].nested_string, "false", "String in second object array element not decoded correctly"); + zassert_str_equal(ts.nested_obj_array[1].nested_string_buf, "false", + "String buffer in second object array element not decoded correctly"); } ZTEST(lib_json_test, test_json_limits) @@ -450,17 +478,24 @@ ZTEST(lib_json_test, test_json_encoding_array_array) { struct obj_array_array obj_array_array_ts = { .objects_array = { - [0] = { { .name = "Sim\303\263n Bol\303\255var", .height = 168 } }, - [1] = { { .name = "Pel\303\251", .height = 173 } }, - [2] = { { .name = "Usain Bolt", .height = 195 } }, + [0] = {{.name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", + .height = 168}}, + [1] = {{.name = "Pel\303\251", + .name_buf = "Pel\303\251", + .height = 173}}, + [2] = {{.name = "Usain Bolt", + .name_buf = "Usain", + .height = 195}}, }, .objects_array_len = 3, }; char encoded[] = "{\"objects_array\":[" - "{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Usain Bolt\",\"height\":195}" - "]}"; + "{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}" + "]}"; + char buffer[sizeof(encoded)]; int ret; @@ -476,9 +511,9 @@ ZTEST(lib_json_test, test_json_decoding_array_array) int ret; struct obj_array_array obj_array_array_ts; char encoded[] = "{\"objects_array\":[" - "{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\"}," - "{\"height\":173,\"name\":\"Pel\303\251\"}," - "{\"height\":195,\"name\":\"Usain Bolt\"}]" + "{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\"}," + "{\"height\":173,\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\"}," + "{\"height\":195,\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\"}]" "}"; ret = json_obj_parse(encoded, sizeof(encoded), @@ -493,16 +528,23 @@ ZTEST(lib_json_test, test_json_decoding_array_array) zassert_str_equal(obj_array_array_ts.objects_array[0].objects.name, "Sim\303\263n Bol\303\255var", "String not decoded correctly"); + zassert_str_equal(obj_array_array_ts.objects_array[0].objects.name_buf, + "Sim\303\263n", + "String buffer not decoded correctly"); zassert_equal(obj_array_array_ts.objects_array[0].objects.height, 168, "Sim\303\263n Bol\303\255var height not decoded correctly"); zassert_str_equal(obj_array_array_ts.objects_array[1].objects.name, "Pel\303\251", "String not decoded correctly"); + zassert_str_equal(obj_array_array_ts.objects_array[1].objects.name_buf, + "Pel\303\251", "String buffer not decoded correctly"); zassert_equal(obj_array_array_ts.objects_array[1].objects.height, 173, "Pel\303\251 height not decoded correctly"); zassert_str_equal(obj_array_array_ts.objects_array[2].objects.name, "Usain Bolt", "String not decoded correctly"); + zassert_str_equal(obj_array_array_ts.objects_array[2].objects.name_buf, + "Usain", "String buffer not decoded correctly"); zassert_equal(obj_array_array_ts.objects_array[2].objects.height, 195, "Usain Bolt height not decoded correctly"); } @@ -511,30 +553,60 @@ ZTEST(lib_json_test, test_json_obj_arr_encoding) { struct obj_array oa = { .elements = { - [0] = { .name = "Sim\303\263n Bol\303\255var", .height = 168 }, - [1] = { .name = "Muggsy Bogues", .height = 160 }, - [2] = { .name = "Pel\303\251", .height = 173 }, - [3] = { .name = "Hakeem Olajuwon", .height = 213 }, - [4] = { .name = "Alex Honnold", .height = 180 }, - [5] = { .name = "Hazel Findlay", .height = 157 }, - [6] = { .name = "Daila Ojeda", .height = 158 }, - [7] = { .name = "Albert Einstein", .height = 172 }, - [8] = { .name = "Usain Bolt", .height = 195 }, - [9] = { .name = "Paavo Nurmi", .height = 174 }, + [0] = { + .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", + .height = 168 }, + [1] = { + .name = "Muggsy Bogues", + .name_buf = "Muggsy", + .height = 160 }, + [2] = { + .name = "Pel\303\251", + .name_buf = "Pel\303\251", + .height = 173 }, + [3] = { + .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", + .height = 213 }, + [4] = { + .name = "Alex Honnold", + .name_buf = "Alex", + .height = 180 }, + [5] = { + .name = "Hazel Findlay", + .name_buf = "Hazel", + .height = 157 }, + [6] = { + .name = "Daila Ojeda", + .name_buf = "Daila", + .height = 158 }, + [7] = { + .name = "Albert Einstein", + .name_buf = "Albert", + .height = 172 }, + [8] = { + .name = "Usain Bolt", + .name_buf = "Usain", + .height = 195 }, + [9] = { + .name = "Paavo Nurmi", + .name_buf = "Paavo", + .height = 174 }, }, .num_elements = 10, }; char encoded[] = "{\"elements\":[" - "{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}," - "{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}," - "{\"name\":\"Usain Bolt\",\"height\":195}," - "{\"name\":\"Paavo Nurmi\",\"height\":174}" + "{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}," + "{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}," + "{\"name\":\"Paavo Nurmi\",\"name_buf\":\"Paavo\",\"height\":174}" "]}"; char buffer[sizeof(encoded)]; int ret; @@ -550,10 +622,11 @@ ZTEST(lib_json_test, test_json_arr_obj_decoding) { int ret; struct obj_array obj_array_array_ts; - char encoded[] = "[{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\"}," - "{\"height\":173,\"name\":\"Pel\303\251\"}," - "{\"height\":195,\"name\":\"Usain Bolt\"}" - "]"; + char encoded[] = "[{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\"," + "\"name_buf\":\"Sim\303\263n\"}," + "{\"height\":173,\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\"}," + "{\"height\":195,\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\"}" + "]"; ret = json_arr_parse(encoded, sizeof(encoded), obj_array_descr, @@ -566,16 +639,23 @@ ZTEST(lib_json_test, test_json_arr_obj_decoding) zassert_str_equal(obj_array_array_ts.elements[0].name, "Sim\303\263n Bol\303\255var", "String not decoded correctly"); + zassert_str_equal(obj_array_array_ts.elements[0].name_buf, + "Sim\303\263n", + "String buffer not decoded correctly"); zassert_equal(obj_array_array_ts.elements[0].height, 168, "Sim\303\263n Bol\303\255var height not decoded correctly"); zassert_str_equal(obj_array_array_ts.elements[1].name, "Pel\303\251", "String not decoded correctly"); + zassert_str_equal(obj_array_array_ts.elements[1].name_buf, "Pel\303\251", + "String buffer not decoded correctly"); zassert_equal(obj_array_array_ts.elements[1].height, 173, "Pel\303\251 height not decoded correctly"); zassert_str_equal(obj_array_array_ts.elements[2].name, "Usain Bolt", "String not decoded correctly"); + zassert_str_equal(obj_array_array_ts.elements[2].name_buf, "Usain", + "String buffer not decoded correctly"); zassert_equal(obj_array_array_ts.elements[2].height, 195, "Usain Bolt height not decoded correctly"); } @@ -584,30 +664,60 @@ ZTEST(lib_json_test, test_json_arr_obj_encoding) { struct obj_array oa = { .elements = { - [0] = { .name = "Sim\303\263n Bol\303\255var", .height = 168 }, - [1] = { .name = "Muggsy Bogues", .height = 160 }, - [2] = { .name = "Pel\303\251", .height = 173 }, - [3] = { .name = "Hakeem Olajuwon", .height = 213 }, - [4] = { .name = "Alex Honnold", .height = 180 }, - [5] = { .name = "Hazel Findlay", .height = 157 }, - [6] = { .name = "Daila Ojeda", .height = 158 }, - [7] = { .name = "Albert Einstein", .height = 172 }, - [8] = { .name = "Usain Bolt", .height = 195 }, - [9] = { .name = "Paavo Nurmi", .height = 174 }, + [0] = { + .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", + .height = 168 }, + [1] = { + .name = "Muggsy Bogues", + .name_buf = "Muggsy", + .height = 160 }, + [2] = { + .name = "Pel\303\251", + .name_buf = "Pel\303\251", + .height = 173 }, + [3] = { + .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", + .height = 213 }, + [4] = { + .name = "Alex Honnold", + .name_buf = "Alex", + .height = 180 }, + [5] = { + .name = "Hazel Findlay", + .name_buf = "Hazel", + .height = 157 }, + [6] = { + .name = "Daila Ojeda", + .name_buf = "Daila", + .height = 158 }, + [7] = { + .name = "Albert Einstein", + .name_buf = "Albert", + .height = 172 }, + [8] = { + .name = "Usain Bolt", + .name_buf = "Usain", + .height = 195 }, + [9] = { + .name = "Paavo Nurmi", + .name_buf = "Paavo", + .height = 174 }, }, .num_elements = 10, }; char encoded[] = "[" - "{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}," - "{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}," - "{\"name\":\"Usain Bolt\",\"height\":195}," - "{\"name\":\"Paavo Nurmi\",\"height\":174}" + "{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}," + "{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}," + "{\"name\":\"Paavo Nurmi\",\"name_buf\":\"Paavo\",\"height\":174}" "]"; char buffer[sizeof(encoded)]; int ret; @@ -626,29 +736,59 @@ ZTEST(lib_json_test, test_json_obj_arr_decoding) { struct obj_array oa; char encoded[] = "{\"elements\":[" - "{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}," - "{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}," - "{\"name\":\"Usain Bolt\",\"height\":195}," - "{\"name\":\"Paavo Nurmi\",\"height\":174}" + "{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}," + "{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}," + "{\"name\":\"Paavo Nurmi\",\"name_buf\":\"Paavo\",\"height\":174}" "]}"; const struct obj_array expected = { .elements = { - [0] = { .name = "Sim\303\263n Bol\303\255var", .height = 168 }, - [1] = { .name = "Muggsy Bogues", .height = 160 }, - [2] = { .name = "Pel\303\251", .height = 173 }, - [3] = { .name = "Hakeem Olajuwon", .height = 213 }, - [4] = { .name = "Alex Honnold", .height = 180 }, - [5] = { .name = "Hazel Findlay", .height = 157 }, - [6] = { .name = "Daila Ojeda", .height = 158 }, - [7] = { .name = "Albert Einstein", .height = 172 }, - [8] = { .name = "Usain Bolt", .height = 195 }, - [9] = { .name = "Paavo Nurmi", .height = 174 }, + [0] = { + .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", + .height = 168 }, + [1] = { + .name = "Muggsy Bogues", + .name_buf = "Muggsy", + .height = 160 }, + [2] = { + .name = "Pel\303\251", + .name_buf = "Pel\303\251", + .height = 173 }, + [3] = { + .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", + .height = 213 }, + [4] = { + .name = "Alex Honnold", + .name_buf = "Alex", + .height = 180 }, + [5] = { + .name = "Hazel Findlay", + .name_buf = "Hazel", + .height = 157 }, + [6] = { + .name = "Daila Ojeda", + .name_buf = "Daila", + .height = 158 }, + [7] = { + .name = "Albert Einstein", + .name_buf = "Albert", + .height = 172 }, + [8] = { + .name = "Usain Bolt", + .name_buf = "Usain", + .height = 195 }, + [9] = { + .name = "Paavo Nurmi", + .name_buf = "Paavo", + .height = 174 }, }, .num_elements = 10, }; @@ -680,14 +820,17 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding) .elements = { [0] = { .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", .height = 168 }, [1] = { .name = "Pel\303\251", + .name_buf = "Pel\303\251", .height = 173 }, [2] = { .name = "Usain Bolt", + .name_buf = "Usain", .height = 195 }, }, @@ -697,10 +840,12 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding) .elements = { [0] = { .name = "Muggsy Bogues", + .name_buf = "Muggsy", .height = 160 }, [1] = { .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", .height = 213 }, }, @@ -710,18 +855,22 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding) .elements = { [0] = { .name = "Alex Honnold", + .name_buf = "Alex", .height = 180 }, [1] = { .name = "Hazel Findlay", + .name_buf = "Hazel", .height = 157 }, [2] = { .name = "Daila Ojeda", + .name_buf = "Daila", .height = 158 }, [3] = { .name = "Albert Einstein", + .name_buf = "Albert", .height = 172 }, }, @@ -731,15 +880,15 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding) .objects_array_array_len = 3, }; char encoded[] = "{\"objects_array_array\":[" - "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Usain Bolt\",\"height\":195}]," - "[{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}]," - "[{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}]" + "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}]," + "[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}]," + "[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]" "]}"; char buffer[sizeof(encoded)]; int ret; @@ -761,14 +910,17 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding) .elements = { [0] = { .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", .height = 168 }, [1] = { .name = "Pel\303\251", + .name_buf = "Pel\303\251", .height = 173 }, [2] = { .name = "Usain Bolt", + .name_buf = "Usain", .height = 195 }, }, @@ -778,10 +930,12 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding) .elements = { [0] = { .name = "Muggsy Bogues", + .name_buf = "Muggsy", .height = 160 }, [1] = { .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", .height = 213 }, }, @@ -791,18 +945,22 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding) .elements = { [0] = { .name = "Alex Honnold", + .name_buf = "Alex", .height = 180 }, [1] = { .name = "Hazel Findlay", + .name_buf = "Hazel", .height = 157 }, [2] = { .name = "Daila Ojeda", + .name_buf = "Daila", .height = 158 }, [3] = { .name = "Albert Einstein", + .name_buf = "Albert", .height = 172 }, }, @@ -814,15 +972,15 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding) char encoded[] = "{\"name\":\"Paavo Nurmi\",\"val\":123," "\"obj_array_2dim\":[" - "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Usain Bolt\",\"height\":195}]," - "[{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}]," - "[{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}]" + "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}]," + "[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}]," + "[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]" "]}"; char buffer[sizeof(encoded)]; int ret; @@ -844,14 +1002,17 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding) .elements = { [0] = { .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", .height = 168 }, [1] = { .name = "Pel\303\251", + .name_buf = "Pel\303\251", .height = 173 }, [2] = { .name = "Usain Bolt", + .name_buf = "Usain", .height = 195 }, }, @@ -861,10 +1022,12 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding) .elements = { [0] = { .name = "Muggsy Bogues", + .name_buf = "Muggsy", .height = 160 }, [1] = { .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", .height = 213 }, }, @@ -874,18 +1037,22 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding) .elements = { [0] = { .name = "Alex Honnold", + .name_buf = "Alex", .height = 180 }, [1] = { .name = "Hazel Findlay", + .name_buf = "Hazel", .height = 157 }, [2] = { .name = "Daila Ojeda", + .name_buf = "Daila", .height = 158 }, [3] = { .name = "Albert Einstein", + .name_buf = "Albert", .height = 172 }, }, @@ -897,15 +1064,15 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding) char encoded[] = "{\"name\":\"Paavo Nurmi\",\"val\":123," "\"data\":[" - "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Usain Bolt\",\"height\":195}]," - "[{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}]," - "[{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}]" + "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}]," + "[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}]," + "[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]" "]}"; char buffer[sizeof(encoded)]; int ret; @@ -922,15 +1089,15 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding) { struct obj_array_2dim oaa; char encoded[] = "{\"objects_array_array\":[" - "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168}," - "{\"name\":\"Pel\303\251\",\"height\":173}," - "{\"name\":\"Usain Bolt\",\"height\":195}]," - "[{\"name\":\"Muggsy Bogues\",\"height\":160}," - "{\"name\":\"Hakeem Olajuwon\",\"height\":213}]," - "[{\"name\":\"Alex Honnold\",\"height\":180}," - "{\"name\":\"Hazel Findlay\",\"height\":157}," - "{\"name\":\"Daila Ojeda\",\"height\":158}," - "{\"name\":\"Albert Einstein\",\"height\":172}]" + "[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168}," + "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173}," + "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}]," + "[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160}," + "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}]," + "[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180}," + "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157}," + "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158}," + "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]" "]}"; const struct obj_array_2dim expected = { .objects_array_array = { @@ -938,14 +1105,17 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding) .elements = { [0] = { .name = "Sim\303\263n Bol\303\255var", + .name_buf = "Sim\303\263n", .height = 168 }, [1] = { .name = "Pel\303\251", + .name_buf = "Pel\303\251", .height = 173 }, [2] = { .name = "Usain Bolt", + .name_buf = "Usain", .height = 195 }, }, @@ -955,10 +1125,12 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding) .elements = { [0] = { .name = "Muggsy Bogues", + .name_buf = "Muggsy", .height = 160 }, [1] = { .name = "Hakeem Olajuwon", + .name_buf = "Hakeem", .height = 213 }, }, @@ -968,18 +1140,22 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding) .elements = { [0] = { .name = "Alex Honnold", + .name_buf = "Alex", .height = 180 }, [1] = { .name = "Hazel Findlay", + .name_buf = "Hazel", .height = 157 }, [2] = { .name = "Daila Ojeda", + .name_buf = "Daila", .height = 158 }, [3] = { .name = "Albert Einstein", + .name_buf = "Albert", .height = 172 }, }, @@ -1010,6 +1186,9 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding) zassert_true(!strcmp(oaa.objects_array_array[i].elements[j].name, expected.objects_array_array[i].elements[j].name), "Element [%d][%d] name not decoded correctly", i, j); + zassert_true(!strcmp(oaa.objects_array_array[i].elements[j].name_buf, + expected.objects_array_array[i].elements[j].name_buf), + "Element [%d][%d] name array not decoded correctly", i, j); zassert_equal(oaa.objects_array_array[i].elements[j].height, expected.objects_array_array[i].elements[j].height, "Element [%d][%d] height not decoded correctly", i, j); @@ -1017,6 +1196,52 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding) } } +ZTEST(lib_json_test, test_json_string_array_size) +{ + int ret; + struct elt elt_ts; + char encoded[] = "{\"name_buf\":\"a12345678\"}"; + + ret = json_obj_parse(encoded, sizeof(encoded), + elt_descr, + ARRAY_SIZE(elt_descr), + &elt_ts); + + /* size of name_buf is 10 */ + zassert_str_equal(elt_ts.name_buf, + "a12345678", "String not decoded correctly"); +} + +ZTEST(lib_json_test, test_json_string_array_empty) +{ + int ret; + struct elt elt_ts; + char encoded[] = "{\"name_buf\":\"\"}"; + + ret = json_obj_parse(encoded, sizeof(encoded), + elt_descr, + ARRAY_SIZE(elt_descr), + &elt_ts); + + /* size of name_buf is 10 */ + zassert_str_equal(elt_ts.name_buf, "", "String not decoded correctly"); +} + +ZTEST(lib_json_test, test_json_string_array_max) +{ + int ret; + struct elt elt_ts; + char encoded[] = "{\"name_buf\":\"a123456789\"}"; + + ret = json_obj_parse(encoded, sizeof(encoded), + elt_descr, + ARRAY_SIZE(elt_descr), + &elt_ts); + + /* string does not fit into name_buf */ + zassert_equal(ret, -EINVAL, "Decoding has to fail"); +} + struct encoding_test { char *str; int result; From 0d9a834381e43d15b9bbe4af17bc3d91e679b342 Mon Sep 17 00:00:00 2001 From: Christoph Winklhofer Date: Wed, 26 Mar 2025 16:40:00 +0100 Subject: [PATCH 3/3] json: improve parsing and serializing of integers Add support for parsing and serializing of following integer types: 'int8_t', 'uint8_t', 'int16_t', 'uint16_t' and 'uint32_t'. The generic integer token JSON_TOK_INT and JSON_TOK_UINT, in combination with the field size (set by JSON_OBJ_DESCR_PRIM) allows to parse different integer types, for example: struct foo { int64_t i64; uint32_t u32; int16_t i16; uint8_t u8; }; struct json_obj_descr foo[] = { JSON_OBJ_DESCR_PRIM(struct foo, i64, JSON_TOK_INT), JSON_OBJ_DESCR_PRIM(struct foo, u32, JSON_TOK_UINT), JSON_OBJ_DESCR_PRIM(struct foo, i16, JSON_TOK_INT), JSON_OBJ_DESCR_PRIM(struct foo, u8, JSON_TOK_UINT), }; These tokens also support parsing and serializing enums: enum unsigned_enum { UA=0, UB=1, UC=2 }; enum signed_enum { SA=-1, SB=0, SC=1 }; struct foo { enum unsigned_enum u; enum signed_enum s; }; struct json_obj_descr foo[] = { JSON_OBJ_DESCR_PRIM(struct foo, u, JSON_TOK_UINT), JSON_OBJ_DESCR_PRIM(struct foo, s, JSON_TOK_INT), }; Signed-off-by: Christoph Winklhofer --- include/zephyr/data/json.h | 23 +++- lib/utils/json.c | 275 ++++++++++++++++++++++++++++++++++++- tests/lib/json/prj.conf | 2 +- tests/lib/json/src/main.c | 178 +++++++++++++++++++++++- 4 files changed, 465 insertions(+), 13 deletions(-) diff --git a/include/zephyr/data/json.h b/include/zephyr/data/json.h index f32a0ba34929..e1889055c1df 100644 --- a/include/zephyr/data/json.h +++ b/include/zephyr/data/json.h @@ -45,6 +45,8 @@ enum json_tokens { JSON_TOK_ENCODED_OBJ = '4', JSON_TOK_INT64 = '5', JSON_TOK_UINT64 = '6', + JSON_TOK_INT = 'i', + JSON_TOK_UINT = 'u', JSON_TOK_TRUE = 't', JSON_TOK_FALSE = 'f', JSON_TOK_NULL = 'n', @@ -251,6 +253,19 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len, }, \ } +/** + * @internal @brief Helper macro to declare a field descriptor + * + * @param struct_ Struct packing the values + * @param field_name_ Field name in the struct + */ +#define Z_JSON_DESCR_FIELD(struct_, field_name_) \ + { \ + .field = { \ + .size = SIZEOF_FIELD(struct_, field_name_), \ + }, \ + } + /** * @brief Helper macro to declare a descriptor for an array of primitives * @@ -283,7 +298,8 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len, .offset = offsetof(struct_, field_name_), \ .array = { \ .element_descr = Z_JSON_ELEMENT_DESCR(struct_, len_field_, \ - elem_type_,), \ + elem_type_, \ + Z_JSON_DESCR_FIELD(struct_, field_name_[0])), \ .n_elements = (max_len_), \ }, \ } @@ -514,8 +530,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len, .type = JSON_TOK_ARRAY_START, \ .offset = offsetof(struct_, struct_field_name_), \ .array = { \ - .element_descr = \ - Z_JSON_ELEMENT_DESCR(struct_, len_field_, elem_type_,), \ + .element_descr = Z_JSON_ELEMENT_DESCR(struct_, len_field_, \ + elem_type_, \ + Z_JSON_DESCR_FIELD(struct_, struct_field_name_[0])), \ .n_elements = (max_len_), \ }, \ } diff --git a/lib/utils/json.c b/lib/utils/json.c index f3a975e4d307..9d55a5682d39 100644 --- a/lib/utils/json.c +++ b/lib/utils/json.c @@ -309,6 +309,8 @@ static int element_token(enum json_tokens token) case JSON_TOK_STRING: case JSON_TOK_STRING_BUF: case JSON_TOK_NUMBER: + case JSON_TOK_INT: + case JSON_TOK_UINT: case JSON_TOK_INT64: case JSON_TOK_UINT64: case JSON_TOK_FLOAT: @@ -434,7 +436,7 @@ static int decode_string_buf(const struct json_token *token, char *str, size_t s return 0; } -static int decode_num(const struct json_token *token, int32_t *num) +static int decode_int32(const struct json_token *token, int32_t *num) { /* FIXME: strtod() is not available in newlib/minimal libc, * so using strtol() here. @@ -461,6 +463,30 @@ static int decode_num(const struct json_token *token, int32_t *num) return 0; } +static int decode_uint32(const struct json_token *token, uint32_t *num) +{ + char *endptr; + char prev_end; + + prev_end = *token->end; + *token->end = '\0'; + + errno = 0; + *num = strtoul(token->start, &endptr, 10); + + *token->end = prev_end; + + if (errno != 0) { + return -errno; + } + + if (endptr != token->end) { + return -EINVAL; + } + + return 0; +} + static int decode_int64(const struct json_token *token, int64_t *num) { char *endptr; @@ -509,6 +535,142 @@ static int decode_uint64(const struct json_token *token, uint64_t *num) return 0; } +static int decode_int8(const struct json_token *token, int8_t *num) +{ + int32_t num_i32; + int res; + + res = decode_int32(token, &num_i32); + + if (res != 0) { + return res; + } + + if (num_i32 < INT8_MIN || num_i32 > INT8_MAX) { + return -EINVAL; + } + + *num = num_i32; + + return 0; +} + +static int decode_uint8(const struct json_token *token, uint8_t *num) +{ + uint32_t num_u32; + int res; + + res = decode_uint32(token, &num_u32); + + if (res != 0) { + return res; + } + + if (num_u32 > UINT8_MAX) { + return -EINVAL; + } + + *num = num_u32; + + return 0; +} + +static int decode_int16(const struct json_token *token, int16_t *num) +{ + int32_t num_i32; + int res; + + res = decode_int32(token, &num_i32); + + if (res != 0) { + return res; + } + + if (num_i32 < INT16_MIN || num_i32 > INT16_MAX) { + return -EINVAL; + } + + *num = num_i32; + + return 0; +} + +static int decode_uint16(const struct json_token *token, uint16_t *num) +{ + uint32_t num_u32; + int res; + + res = decode_uint32(token, &num_u32); + + if (res != 0) { + return res; + } + + if (num_u32 > UINT16_MAX) { + return -EINVAL; + } + + *num = num_u32; + + return 0; +} + +static int decode_int(const struct json_token *token, void *field, size_t size) +{ + switch (size) { + case 1: { + int8_t *num = field; + + return decode_int8(token, num); + } + case 2: { + int16_t *num = field; + + return decode_int16(token, num); + } + case 4: { + int32_t *num = field; + + return decode_int32(token, num); + } + case 8: { + int64_t *num = field; + + return decode_int64(token, num); + } + default: + return -EINVAL; + } +} + +static int decode_uint(const struct json_token *token, void *field, size_t size) +{ + switch (size) { + case 1: { + uint8_t *num = field; + + return decode_uint8(token, num); + } + case 2: { + uint16_t *num = field; + + return decode_uint16(token, num); + } + case 4: { + uint32_t *num = field; + + return decode_uint32(token, num); + } + case 8: { + uint64_t *num = field; + + return decode_uint64(token, num); + } + default: + return -EINVAL; + } +} + static bool equivalent_types(enum json_tokens type1, enum json_tokens type2) { if (type1 == JSON_TOK_TRUE || type1 == JSON_TOK_FALSE) { @@ -519,6 +681,14 @@ static bool equivalent_types(enum json_tokens type1, enum json_tokens type2) return true; } + if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_INT) { + return true; + } + + if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_UINT) { + return true; + } + if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_INT64) { return true; } @@ -586,7 +756,13 @@ static int64_t decode_value(struct json_obj *obj, case JSON_TOK_NUMBER: { int32_t *num = field; - return decode_num(value, num); + return decode_int32(value, num); + } + case JSON_TOK_INT: { + return decode_int(value, field, descr->field.size); + } + case JSON_TOK_UINT: { + return decode_uint(value, field, descr->field.size); } case JSON_TOK_INT64: { int64_t *num = field; @@ -639,6 +815,8 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr) return sizeof(struct json_obj_token); case JSON_TOK_STRING: return sizeof(char *); + case JSON_TOK_INT: + case JSON_TOK_UINT: case JSON_TOK_STRING_BUF: return descr->field.size; case JSON_TOK_TRUE: @@ -1067,8 +1245,8 @@ static int str_encode(const char *str, json_append_bytes_t append_bytes, return ret; } -static int num_encode(const int32_t *num, json_append_bytes_t append_bytes, - void *data) +static int int32_encode(const int32_t *num, json_append_bytes_t append_bytes, + void *data) { char buf[3 * sizeof(int32_t)]; int ret; @@ -1084,6 +1262,23 @@ static int num_encode(const int32_t *num, json_append_bytes_t append_bytes, return append_bytes(buf, (size_t)ret, data); } +static int uint32_encode(const uint32_t *num, json_append_bytes_t append_bytes, + void *data) +{ + char buf[3 * sizeof(uint32_t)]; + int ret; + + ret = snprintk(buf, sizeof(buf), "%u", *num); + if (ret < 0) { + return ret; + } + if (ret >= (int)sizeof(buf)) { + return -ENOMEM; + } + + return append_bytes(buf, (size_t)ret, data); +} + static int int64_encode(const int64_t *num, json_append_bytes_t append_bytes, void *data) { @@ -1118,6 +1313,72 @@ static int uint64_encode(const uint64_t *num, json_append_bytes_t append_bytes, return append_bytes(buf, (size_t)ret, data); } +static int int_encode(const void *ptr, size_t size, json_append_bytes_t append_bytes, + void *data) +{ + switch (size) { + case 1: { + const int8_t *num_8 = ptr; + int32_t num = *num_8; + + return int32_encode(&num, append_bytes, data); + } + case 2: { + const int16_t *num_16 = ptr; + int32_t num = *num_16; + + return int32_encode(&num, append_bytes, data); + } + case 4: { + const int32_t *num_32 = ptr; + int32_t num = *num_32; + + return int32_encode(&num, append_bytes, data); + } + case 8: { + const int64_t *num_64 = ptr; + int64_t num = *num_64; + + return int64_encode(&num, append_bytes, data); + } + default: + return -EINVAL; + } +} + +static int uint_encode(const void *ptr, size_t size, json_append_bytes_t append_bytes, + void *data) +{ + switch (size) { + case 1: { + const uint8_t *num_8 = ptr; + uint32_t num = *num_8; + + return uint32_encode(&num, append_bytes, data); + } + case 2: { + const uint16_t *num_16 = ptr; + uint32_t num = *num_16; + + return uint32_encode(&num, append_bytes, data); + } + case 4: { + const uint32_t *num_32 = ptr; + uint32_t num = *num_32; + + return uint32_encode(&num, append_bytes, data); + } + case 8: { + const uint64_t *num_64 = ptr; + uint64_t num = *num_64; + + return uint64_encode(&num, append_bytes, data); + } + default: + return -EINVAL; + } +} + static int float_ascii_encode(struct json_obj_token *num, json_append_bytes_t append_bytes, void *data) { @@ -1184,7 +1445,11 @@ static int encode(const struct json_obj_descr *descr, const void *val, descr->object.sub_descr_len, ptr, append_bytes, data); case JSON_TOK_NUMBER: - return num_encode(ptr, append_bytes, data); + return int32_encode(ptr, append_bytes, data); + case JSON_TOK_INT: + return int_encode(ptr, descr->field.size, append_bytes, data); + case JSON_TOK_UINT: + return uint_encode(ptr, descr->field.size, append_bytes, data); case JSON_TOK_INT64: return int64_encode(ptr, append_bytes, data); case JSON_TOK_UINT64: diff --git a/tests/lib/json/prj.conf b/tests/lib/json/prj.conf index 4a6c8522abd6..ca1235c611d7 100644 --- a/tests/lib/json/prj.conf +++ b/tests/lib/json/prj.conf @@ -1,3 +1,3 @@ CONFIG_JSON_LIBRARY=y CONFIG_ZTEST=y -CONFIG_ZTEST_STACK_SIZE=3072 +CONFIG_ZTEST_STACK_SIZE=3200 diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c index 479b2ea7f867..137916ada528 100644 --- a/tests/lib/json/src/main.c +++ b/tests/lib/json/src/main.c @@ -14,6 +14,8 @@ struct test_nested { bool nested_bool; const char *nested_string; char nested_string_buf[10]; + int8_t nested_int8; + uint8_t nested_uint8; int64_t nested_int64; uint64_t nested_uint64; }; @@ -23,6 +25,7 @@ struct test_struct { char some_string_buf[10]; int some_int; bool some_bool; + int16_t some_int16; int64_t some_int64; int64_t another_int64; int64_t some_uint64; @@ -60,6 +63,21 @@ struct test_int_limits { uint64_t uint64_max; uint64_t uint64_cero; uint64_t uint64_min; + uint32_t uint32_max; + uint32_t uint32_cero; + uint32_t uint32_min; + int16_t int16_max; + int16_t int16_cero; + int16_t int16_min; + uint16_t uint16_max; + uint16_t uint16_cero; + uint16_t uint16_min; + int8_t int8_max; + int8_t int8_cero; + int8_t int8_min; + uint8_t uint8_max; + uint8_t uint8_cero; + uint8_t uint8_min; }; static const struct json_obj_descr nested_descr[] = { @@ -69,6 +87,8 @@ static const struct json_obj_descr nested_descr[] = { JSON_TOK_STRING), JSON_OBJ_DESCR_PRIM(struct test_nested, nested_string_buf, JSON_TOK_STRING_BUF), + JSON_OBJ_DESCR_PRIM(struct test_nested, nested_int8, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_nested, nested_uint8, JSON_TOK_UINT), JSON_OBJ_DESCR_PRIM(struct test_nested, nested_int64, JSON_TOK_INT64), JSON_OBJ_DESCR_PRIM(struct test_nested, nested_uint64, @@ -80,6 +100,7 @@ static const struct json_obj_descr test_descr[] = { JSON_OBJ_DESCR_PRIM(struct test_struct, some_string_buf, JSON_TOK_STRING_BUF), JSON_OBJ_DESCR_PRIM(struct test_struct, some_int, JSON_TOK_NUMBER), JSON_OBJ_DESCR_PRIM(struct test_struct, some_bool, JSON_TOK_TRUE), + JSON_OBJ_DESCR_PRIM(struct test_struct, some_int16, JSON_TOK_INT), JSON_OBJ_DESCR_PRIM(struct test_struct, some_int64, JSON_TOK_INT64), JSON_OBJ_DESCR_PRIM(struct test_struct, another_int64, @@ -126,6 +147,21 @@ static const struct json_obj_descr obj_limits_descr[] = { JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint64_max, JSON_TOK_UINT64), JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint64_cero, JSON_TOK_UINT64), JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint64_min, JSON_TOK_UINT64), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint32_max, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint32_cero, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint32_min, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, int16_max, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, int16_cero, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, int16_min, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint16_max, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint16_cero, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint16_min, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, int8_max, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, int8_cero, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, int8_min, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint8_max, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint8_cero, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint8_min, JSON_TOK_UINT), }; struct array { @@ -233,12 +269,39 @@ static const struct json_obj_descr alignment_bool_descr[] = { JSON_OBJ_DESCR_OBJ_ARRAY(struct test_alignment_bool, array, 3, num_elements, alignment_nested_descr, ARRAY_SIZE(alignment_nested_descr)) }; +enum int8_enum { I8_MIN = INT8_MIN, I8_MAX = INT8_MAX }; +enum uint8_enum { U8_MIN = 0, U8_MAX = UINT8_MAX }; +enum int16_enum { I16_MIN = INT16_MIN, I16_MAX = INT16_MAX }; +enum uint16_enum { U16_MIN = 0, U16_MAX = UINT16_MAX }; +enum int32_enum { I32_MIN = INT32_MIN, I32_MAX = INT32_MAX }; +enum uint32_enum { U32_MIN = 0, U32_MAX = UINT32_MAX }; + +struct test_enums { + enum int8_enum i8; + enum uint8_enum u8; + enum int16_enum i16; + enum uint16_enum u16; + enum int32_enum i32; + enum uint32_enum u32; +}; + +static const struct json_obj_descr enums_descr[] = { + JSON_OBJ_DESCR_PRIM(struct test_enums, i8, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_enums, u8, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_enums, i16, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_enums, u16, JSON_TOK_UINT), + JSON_OBJ_DESCR_PRIM(struct test_enums, i32, JSON_TOK_INT), + JSON_OBJ_DESCR_PRIM(struct test_enums, u32, JSON_TOK_UINT), +}; + + ZTEST(lib_json_test, test_json_encoding) { struct test_struct ts = { .some_string = "zephyr 123\uABCD", .some_string_buf = "z 123\uABCD", .some_int = 42, + .some_int16 = 16, .some_int64 = 1152921504606846977, .another_int64 = -2305843009213693937, .some_uint64 = 18446744073709551615U, @@ -249,6 +312,8 @@ ZTEST(lib_json_test, test_json_encoding) .nested_bool = false, .nested_string = "this should be escaped: \t", .nested_string_buf = "esc: \t", + .nested_int8 = -123, + .nested_uint8 = 231, .nested_int64 = 4503599627370496, .nested_uint64 = 18446744073709551610U, }, @@ -270,6 +335,8 @@ ZTEST(lib_json_test, test_json_encoding) .nested_bool = true, .nested_string = "no escape necessary", .nested_string_buf = "no escape", + .nested_int8 = 123, + .nested_uint8 = 231, .nested_int64 = 4503599627370496, .nested_uint64 = 18446744073709551610U, }, @@ -281,7 +348,7 @@ ZTEST(lib_json_test, test_json_encoding) }; char encoded[] = "{\"some_string\":\"zephyr 123\uABCD\"," "\"some_string_buf\":\"z 123\uABCD\"," - "\"some_int\":42,\"some_bool\":true," + "\"some_int\":42,\"some_bool\":true,\"some_int16\":16," "\"some_int64\":1152921504606846977," "\"another_int64\":-2305843009213693937," "\"some_uint64\":18446744073709551615," @@ -290,6 +357,8 @@ ZTEST(lib_json_test, test_json_encoding) "\"nested_bool\":false,\"nested_string\":" "\"this should be escaped: \\t\"," "\"nested_string_buf\":\"esc: \\t\"," + "\"nested_int8\":-123," + "\"nested_uint8\":231," "\"nested_int64\":4503599627370496," "\"nested_uint64\":18446744073709551610}," "\"some_array\":[1,4,8,16,32]," @@ -300,11 +369,13 @@ ZTEST(lib_json_test, test_json_encoding) "\"nested_bool\":true," "\"nested_string\":\"no escape necessary\"," "\"nested_string_buf\":\"no escape\"," + "\"nested_int8\":123," + "\"nested_uint8\":231," "\"nested_int64\":4503599627370496," "\"nested_uint64\":18446744073709551610}," "\"nested_obj_array\":[" - "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\",\"nested_int64\":0,\"nested_uint64\":0}," - "{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_string_buf\":\"false\",\"nested_int64\":0,\"nested_uint64\":0}]" + "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\",\"nested_int8\":0,\"nested_uint8\":0,\"nested_int64\":0,\"nested_uint64\":0}," + "{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_string_buf\":\"false\",\"nested_int8\":0,\"nested_uint8\":0,\"nested_int64\":0,\"nested_uint64\":0}]" "}"; char buffer[sizeof(encoded)]; int ret; @@ -327,6 +398,7 @@ ZTEST(lib_json_test, test_json_decoding) char encoded[] = "{\"some_string\":\"zephyr 123\\uABCD456\"," "\"some_string_buf\":\"z\\uABCD\"," "\"some_int\":\t42\n," + "\"some_int16\":\t16\n," "\"some_bool\":true \t " "\n" "\r ," @@ -339,6 +411,7 @@ ZTEST(lib_json_test, test_json_decoding) "\"nested_bool\":false,\t" "\"nested_string\":\"this should be escaped: \\t\"," "\"nested_string_buf\":\"esc: \\t\"," + "\"nested_int8\":123," "\"nested_int64\":9223372036854775807," "\"extra_nested_array\":[0,-1]}," "\"extra_struct\":{\"nested_bool\":false}," @@ -351,6 +424,7 @@ ZTEST(lib_json_test, test_json_decoding) "\"nested_bool\":true," "\"nested_string\":\"no escape necessary\"," "\"nested_string_buf\":\"no escape\"," + "\"nested_int8\":-123," "\"nested_int64\":-9223372036854775806}," "\"nested_obj_array\":[" "{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\"}," @@ -371,6 +445,7 @@ ZTEST(lib_json_test, test_json_decoding) zassert_str_equal(ts.some_string_buf, "z\\uABCD", "String (array) not decoded correctly"); zassert_equal(ts.some_int, 42, "Positive integer not decoded correctly"); + zassert_equal(ts.some_int16, 16, "Positive integer not decoded correctly"); zassert_equal(ts.some_bool, true, "Boolean not decoded correctly"); zassert_equal(ts.some_int64, -4611686018427387904, "int64 not decoded correctly"); @@ -378,6 +453,8 @@ ZTEST(lib_json_test, test_json_decoding) "int64 not decoded correctly"); zassert_equal(ts.some_nested_struct.nested_int, -1234, "Nested negative integer not decoded correctly"); + zassert_equal(ts.some_nested_struct.nested_int8, 123, + "Nested int8 not decoded correctly"); zassert_equal(ts.some_nested_struct.nested_int64, 9223372036854775807, "Nested int64 not decoded correctly"); zassert_equal(ts.some_nested_struct.nested_bool, false, @@ -404,6 +481,8 @@ ZTEST(lib_json_test, test_json_decoding) "Decoded named array not with expected values"); zassert_equal(ts.xnother_nexx.nested_int, 1234, "Named nested integer not decoded correctly"); + zassert_equal(ts.xnother_nexx.nested_int8, -123, + "Named nested int8 not decoded correctly"); zassert_equal(ts.xnother_nexx.nested_int64, -9223372036854775806, "Named nested int64 not decoded correctly"); zassert_equal(ts.xnother_nexx.nested_bool, true, @@ -445,7 +524,22 @@ ZTEST(lib_json_test, test_json_limits) "\"int64_min\":-9223372036854775808," "\"uint64_max\":18446744073709551615," "\"uint64_cero\":0," - "\"uint64_min\":0" + "\"uint64_min\":0," + "\"uint32_max\":4294967295," + "\"uint32_cero\":0," + "\"uint32_min\":0," + "\"int16_max\":32767," + "\"int16_cero\":0," + "\"int16_min\":-32768," + "\"uint16_max\":65535," + "\"uint16_cero\":0," + "\"uint16_min\":0," + "\"int8_max\":127," + "\"int8_cero\":0," + "\"int8_min\":-128," + "\"uint8_max\":255," + "\"uint8_cero\":0," + "\"uint8_min\":0" "}"; struct test_int_limits limits = { @@ -458,6 +552,21 @@ ZTEST(lib_json_test, test_json_limits) .uint64_max = UINT64_MAX, .uint64_cero = 0, .uint64_min = 0, + .uint32_max = UINT32_MAX, + .uint32_cero = 0, + .uint32_min = 0, + .int16_max = INT16_MAX, + .int16_cero = 0, + .int16_min = INT16_MIN, + .uint16_max = UINT16_MAX, + .uint16_cero = 0, + .uint16_min = 0, + .int8_max = INT8_MAX, + .int8_cero = 0, + .int8_min = INT8_MIN, + .uint8_max = UINT8_MAX, + .uint8_cero = 0, + .uint8_min = 0, }; char buffer[sizeof(encoded)]; @@ -1631,4 +1740,65 @@ ZTEST(lib_json_test, test_json_array_alignment_bool) zassert_equal(o.array[1].bool2, false, "Element 1 bool2 not decoded correctly"); } +ZTEST(lib_json_test, test_json_invalid_int) +{ + struct sub_test { + char str[30]; + int result; + }; + struct sub_test encoded[] = { + { "{\"int8_cero\":128}", -EINVAL }, + { "{\"int8_cero\":-129}", -EINVAL }, + { "{\"uint8_cero\":257}", -EINVAL }, + { "{\"int16_cero\":32768}", -EINVAL }, + { "{\"int16_cero\":-32769}", -EINVAL }, + { "{\"uint16_cero\":65536}", -EINVAL }, + }; + + struct test_int_limits ts; + int ret; + + for (int i = 0; i < ARRAY_SIZE(encoded); i++) { + ret = json_obj_parse(encoded[i].str, strlen(encoded[i].str), + obj_limits_descr, ARRAY_SIZE(obj_limits_descr), &ts); + zassert_equal(ret, encoded[i].result, + "Decoding '%s' result %d, expected %d", + encoded[i].str, ret, encoded[i].result); + } +} + +ZTEST(lib_json_test, test_json_enums) +{ + int ret = 0; + char encoded[] = "{\"i8\":-128," + "\"u8\":255," + "\"i16\":-32768," + "\"u16\":65535," + "\"i32\":-2147483648," + "\"u32\":4294967295" + "}"; + + struct test_enums enums = { + .i8 = I8_MIN, + .u8 = U8_MAX, + .i16 = I16_MIN, + .u16 = U16_MAX, + .i32 = I32_MIN, + .u32 = U32_MAX, + }; + + char buffer[sizeof(encoded)]; + struct test_enums enums_decoded = {0}; + + ret = json_obj_encode_buf(enums_descr, ARRAY_SIZE(enums_descr), + &enums, buffer, sizeof(buffer)); + ret = json_obj_parse(encoded, sizeof(encoded) - 1, enums_descr, + ARRAY_SIZE(enums_descr), &enums_decoded); + + zassert_str_equal(encoded, buffer, + "Enums not encoded correctly"); + zassert_true(!memcmp(&enums, &enums_decoded, sizeof(enums)), + "Enums not decoded correctly"); +} + ZTEST_SUITE(lib_json_test, NULL, NULL, NULL, NULL, NULL);