From 6f49eeec51e1697496d97479d41ff31cb4563270 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 19 Jun 2014 12:08:08 +0200 Subject: [PATCH] matcher.c: properly handle negative array indizes Signed-off-by: Jo-Philipp Wich --- matcher.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/matcher.c b/matcher.c index 7fb6d02..ceb756e 100644 --- a/matcher.c +++ b/matcher.c @@ -237,7 +237,8 @@ jp_match_next(struct jp_opcode *ptr, struct json_object *root, struct json_object *cur, jp_match_cb_t cb, void *priv) { - struct json_object *next; + int idx; + struct json_object *next = NULL; if (!ptr) { @@ -257,7 +258,13 @@ jp_match_next(struct jp_opcode *ptr, break; case T_NUMBER: - next = json_object_array_get_idx(cur, ptr->num); + idx = ptr->num; + + if (idx < 0) + idx += json_object_array_length(cur); + + if (idx >= 0) + next = json_object_array_get_idx(cur, idx); if (next) return jp_match_next(ptr->sibling, root, next, cb, priv); -- 2.25.1