From: James Prestwood <prestwoj at gmail.com>
To: iwd at lists.01.org
Subject: [PATCH 3/5] json: add NULL check for container on get_container
Date: Thu, 06 Jan 2022 14:42:14 -0800 [thread overview]
Message-ID: <20220106224216.569171-3-prestwoj@gmail.com> (raw)
In-Reply-To: 20220106224216.569171-1-prestwoj@gmail.com
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
In case the caller just wants to check an object is iterable,
without actually iterating it.
---
src/json.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/json.c b/src/json.c
index b89fbaa6..0942dae3 100644
--- a/src/json.c
+++ b/src/json.c
@@ -393,7 +393,8 @@ bool json_iter_get_container(struct json_iter *iter,
if (t->type != JSMN_OBJECT && t->type != JSMN_ARRAY)
return false;
- iter_recurse(iter, t, container);
+ if (container)
+ iter_recurse(iter, t, container);
return true;
}
--
2.31.1
reply other threads:[~2022-01-06 22:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220106224216.569171-3-prestwoj@gmail.com \
--to=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox