From 261c9309485818a9c0c04c18da69413149d8f8a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 12 Dec 2023 18:42:44 +0100 Subject: [PATCH] libsmartcols: only recognize closed object as final element MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When streaming JSON normal values also have indent == 1. For those however it is incorrect to close the stream. Fixes #2644 Signed-off-by: Thomas Weißschuh (cherry picked from commit 5130ce8ee5b71c249e0c8bb7a4975dc8a48c64fa) --- lib/jsonwrt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/jsonwrt.c b/lib/jsonwrt.c index 8ca1d4d9a3..9ba6d1f534 100644 --- a/lib/jsonwrt.c +++ b/lib/jsonwrt.c @@ -154,12 +154,6 @@ void ul_jsonwrt_open(struct ul_jsonwrt *fmt, const char *name, int type) void ul_jsonwrt_close(struct ul_jsonwrt *fmt, int type) { - if (fmt->indent == 1) { - fputs("\n}\n", fmt->out); - fmt->indent--; - fmt->after_close = 1; - return; - } assert(fmt->indent > 0); switch (type) { @@ -168,6 +162,8 @@ void ul_jsonwrt_close(struct ul_jsonwrt *fmt, int type) fputc('\n', fmt->out); ul_jsonwrt_indent(fmt); fputs("}", fmt->out); + if (fmt->indent == 0) + fputs("\n", fmt->out); break; case UL_JSON_ARRAY: fmt->indent--; -- 2.47.3