jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

JSON: Fix parsing of arrays of numbers, strings, literals

Browse source 
The previous implementation was able to parse arrays of objects, but not
arrays of other types of items.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-08-23 00:28:55 +03:00 committed by Jouni Malinen
parent a4bf007877
commit d4488b9dad
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/utils/json.c
View file

@ -296,6 +296,16 @@ struct json_token * json_parse(const char *data, size_t data_len)
token->type = JSON_STRING; token->type = JSON_STRING;
token->string = str; token->string = str;
token->state = JSON_COMPLETED; token->state = JSON_COMPLETED;
} else if (curr_token->parent &&
curr_token->parent->type == JSON_ARRAY &&
curr_token->parent->state == JSON_STARTED &&
curr_token->state == JSON_EMPTY) {
curr_token->string = str;
curr_token->state = JSON_COMPLETED;
curr_token->type = JSON_STRING;
wpa_printf(MSG_MSGDUMP,
"JSON: String value: '%s'",
curr_token->string);
} else if (curr_token->state == JSON_EMPTY) { } else if (curr_token->state == JSON_EMPTY) {
curr_token->type = JSON_VALUE; curr_token->type = JSON_VALUE;
curr_token->name = str; curr_token->name = str;
@ -358,6 +368,12 @@ struct json_token * json_parse(const char *data, size_t data_len)
wpa_printf(MSG_MSGDUMP, wpa_printf(MSG_MSGDUMP,
"JSON: Literal name: '%s' = %c", "JSON: Literal name: '%s' = %c",
curr_token->name, *pos); curr_token->name, *pos);
} else if (curr_token->parent &&
curr_token->parent->type == JSON_ARRAY &&
curr_token->parent->state == JSON_STARTED &&
curr_token->state == JSON_EMPTY) {
wpa_printf(MSG_MSGDUMP,
"JSON: Literal name: %c", *pos);
} else { } else {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"JSON: Invalid state for a literal name"); "JSON: Invalid state for a literal name");
@ -410,6 +426,16 @@ struct json_token * json_parse(const char *data, size_t data_len)
"JSON: Number value: '%s' = '%d'", "JSON: Number value: '%s' = '%d'",
curr_token->name, curr_token->name,
curr_token->number); curr_token->number);
} else if (curr_token->parent &&
curr_token->parent->type == JSON_ARRAY &&
curr_token->parent->state == JSON_STARTED &&
curr_token->state == JSON_EMPTY) {
curr_token->number = num;
curr_token->state = JSON_COMPLETED;
curr_token->type = JSON_NUMBER;
wpa_printf(MSG_MSGDUMP,
"JSON: Number value: %d",
curr_token->number);
} else { } else {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"JSON: Invalid state for a number"); "JSON: Invalid state for a number");