[PATCH 4/5] json: restrict json_iter_{parse,next} to objects/arrays

[PATCH 4/5] json: restrict json_iter_{parse,next} to objects/arrays

[James Prestwood]

[-- Attachment #1: Type: text/plain, Size: 994 bytes --]

json_iter_parse is only meant to work on objects while
json_iter_next is only meant to work on arrays.

This adds checks in both APIs to ensure they aren't being
used incorrectly.
---
 src/json.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/json.c b/src/json.c
index 0942dae3..869a3f43 100644
--- a/src/json.c
+++ b/src/json.c
@@ -200,6 +200,9 @@ bool json_iter_parse(struct json_iter *iter, enum json_type type, ...)
 	if (iter->start == -1)
 		return false;
 
+	if (c->tokens[iter->start].type != JSMN_OBJECT)
+		return false;
+
 	args = l_queue_new();
 
 	va_start(va, type);
@@ -427,6 +430,9 @@ bool json_iter_next(struct json_iter *iter)
 	jsmntok_t *t = c->tokens + iter->current;
 	int inc = 1;
 
+	if (iter->current == iter->start && t->type != JSMN_ARRAY)
+		return false;
+
 	/*
 	 * If this is the initial iteration skip this and just increment
 	 * current by 1 since this iterator points to a container which needs to
-- 
2.31.1