From d19997a3deb68585ea4080615ca3502e0d6930f8 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sun, 8 Jan 2023 05:19:28 +0100 Subject: JSON: Only allow to convert PLIST_DICT or PLIST_ARRAY node to JSON --- src/jplist.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/jplist.c b/src/jplist.c index d12540e..f4adf2f 100644 --- a/src/jplist.c +++ b/src/jplist.c @@ -395,6 +395,11 @@ PLIST_API int plist_to_json(plist_t plist, char **json, uint32_t* length, int pr return PLIST_ERR_INVALID_ARG; } + if (!PLIST_IS_DICT(plist) && !PLIST_IS_ARRAY(plist)) { + PLIST_JSON_WRITE_ERR("plist data is not valid for JSON format\n"); + return PLIST_ERR_FORMAT; + } + res = node_estimate_size(plist, &size, 0, prettify); if (res < 0) { return res; @@ -413,6 +418,9 @@ PLIST_API int plist_to_json(plist_t plist, char **json, uint32_t* length, int pr *length = 0; return res; } + if (prettify) { + str_buf_append(outbuf, "\n", 1); + } str_buf_append(outbuf, "\0", 1); -- cgit v1.1-32-gdbae