Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-29 13:59:24 +01:00
Code Releases Activity

json: fix find_object_tokens

Browse Source 
First, this was renamed to 'count_tokens_in_container' to be
more general purpose (i.e. include future array counting).

The way the tokens are counted also changed to be more intuitive.
While the previous way was correct, it was somewhat convoluted in
how it worked (finding the next parent of the objects parent).

Instead we can use the container token itself as the parent and
begin counting tokens. When we find a token with a parent index
less than the target we have reached the end of this container.
This also works for nested containers, including arrays since we
no longer rely on a key (which an array element would not have).

For example::

{
	"first":{"foo":"bar"},
	"second":{"foo2":"bar2"}
}

index 0		<overall object>
index 1		"first"		with parent 0
index 2         {"foo":"bar"}   with parent 1

Counting tokens inside "first"'s object we have:

index 3		"foo"		with parent 2
index 4		"bar"		with parent 3

If we continue counting we reach:

index 5		"second"	with parent 0

This terminates the counting loop since the parent index is
less than '2' (the index of {"foo":"bar"} object).
This commit is contained in:
James Prestwood 2022-01-06 11:49:59 -08:00 committed by Denis Kenzior
parent 876d81e861
commit 23a1a66aee
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/json.c
View File

@ -69,20 +69,17 @@ static jsmntok_t *next_key_in_parent(struct json_iter *iter, jsmntok_t *current)
return NULL; return NULL;
} }
/* static int count_tokens_in_container(struct json_iter *iter,
* 'object' is expected to be a value, so object - 1 is its key. Find jsmntok_t *container)
* the next key who's parent matches the parent of object - 1. The
* token preceeding this next key will mark the end of 'object'.
*/
static int find_object_tokens(struct json_iter *iter, jsmntok_t *object)
{ {
jsmntok_t *next = next_key_in_parent(iter, object - 1); int idx = container - iter->contents->tokens;
jsmntok_t *contents;
/* End of token list */ for (contents = ++container; contents < ITER_END(iter); contents++)
if (!next) if (contents->parent < idx)
next = ITER_END(iter); break;
return next - object - 1; return contents - container;
} }
static void iter_recurse(struct json_iter *iter, jsmntok_t *object, static void iter_recurse(struct json_iter *iter, jsmntok_t *object,
@ -92,7 +89,7 @@ static void iter_recurse(struct json_iter *iter, jsmntok_t *object,
child->contents = c; child->contents = c;
child->start = object - c->tokens; child->start = object - c->tokens;
child->count = find_object_tokens(iter, object); child->count = count_tokens_in_container(iter, object);
} }
struct json_contents *json_contents_new(const char *json, size_t json_len) struct json_contents *json_contents_new(const char *json, size_t json_len)