Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

os/json: Skip json null value when parsing json content #36332

Closed
wants to merge 9 commits into from
Closed

os/json: Skip json null value when parsing json content #36332

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3814cc
os/json: Skip json null value when parsing json content
ebrinette Jun 16, 2021
12491a7
Only handle null for string expected value, nullify the string when n…
ebrinette Jul 13, 2021
bb13aee
Set the n-th return bit if null was expected and null was found.
ebrinette Jul 13, 2021
3c45e66
Handle encoding for JSON_TOK_NULL and null strings
ebrinette Jul 14, 2021
bdc5e3f
Adapt tests to null and null_string
ebrinette Jul 14, 2021
931442b
Fix compilation errors
ebrinette Jul 19, 2021
ef9bc5d
Fix compilation
ebrinette Jul 19, 2021
24099f1
Remove null string because we don't set the n-th bit to 1 when we fou…
ebrinette Jul 19, 2021
8f0de2e
Fix flag set to 1 for null type values with null descriptors
ebrinette Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions lib/os/json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ static int element_token(enum json_tokens token)
case JSON_TOK_NUMBER:
case JSON_TOK_TRUE:
case JSON_TOK_FALSE:
case JSON_TOK_NULL: // Accept null values
return 0;
default:
return -EINVAL;
Expand Down Expand Up @@ -424,6 +425,25 @@ static bool equivalent_types(enum json_tokens type1, enum json_tokens type2)
return type1 == type2;
}

static int check_null_type(enum json_tokens value_type, enum json_tokens descr_type)
{
if(JSON_TOK_NULL != value_type) {
return 0;
}

switch (descr_type) {
case JSON_TOK_FALSE:
case JSON_TOK_TRUE:
case JSON_TOK_NUMBER:
case JSON_TOK_STRING:
case JSON_TOK_NULL:
// Leave values unchanged
return 1;
default:
return -EINVAL;
}
}

static int obj_parse(struct json_obj *obj,
const struct json_obj_descr *descr, size_t descr_len,
void *val);
Expand All @@ -436,9 +456,15 @@ static int decode_value(struct json_obj *obj,
struct token *value, void *field, void *val)
{

if (!equivalent_types(value->type, descr->type)) {
if (value->type != JSON_TOK_NULL && !equivalent_types(value->type, descr->type)) {
return -EINVAL;
}

int null_type = check_null_type(value->type, descr->type);
if(null_type)
{
return null_type < 0 ? null_type : 0; // Return err or just ignore the current value
}

switch (descr->type) {
case JSON_TOK_OBJECT_START:
Expand Down Expand Up @@ -574,7 +600,9 @@ static int obj_parse(struct json_obj *obj, const struct json_obj_descr *descr,
return ret;
}

decoded_fields |= 1<<i;
if(kv.value.type != JSON_TOK_NULL) {
decoded_fields |= 1<<i;
}
break;
}
}
Expand Down