From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Sat, 17 Jun 2023 15:06:26 +0000 (+0900)
Subject: json: Use memory block allocated by realloc() instead printbuf
X-Git-Tag: v1.5~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=37ee3da3e5f9bb6747e005d4d02f4dc34b8f2feb;p=users%2Fsagi%2Flibnvme.git

json: Use memory block allocated by realloc() instead printbuf

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
---

diff --git a/src/nvme/json.c b/src/nvme/json.c
index 3e711a7c..7a5a69e5 100644
--- a/src/nvme/json.c
+++ b/src/nvme/json.c
@@ -193,18 +193,22 @@ static struct json_object *parse_json(nvme_root_t r, int fd)
 {
 	char buf[JSON_FILE_BUF_SIZE];
 	struct json_object *obj = NULL;
-	struct printbuf *pb;
+	char *str = NULL;
 	json_tokener *tok = NULL;
 	int ret;
+	void *ptr = NULL;
+	int len = 0;
+
+	while ((ret = read(fd, buf, JSON_FILE_BUF_SIZE)) > 0) {
+		str = realloc(ptr, len + ret);
+		if (!str)
+			goto out;
+		memcpy(&str[len], buf, ret);
+		len += ret;
+		ptr = str;
+	}
 
-	pb = printbuf_new();
-	if (!pb)
-		return NULL;
-
-	while ((ret = read(fd, buf, JSON_FILE_BUF_SIZE)) > 0)
-		printbuf_memappend(pb, buf, ret);
-
-	if (ret < 0)
+	if (ret < 0 || !len)
 		goto out;
 
 	tok = json_tokener_new_ex(JSON_TOKENER_DEFAULT_DEPTH);
@@ -214,14 +218,14 @@ static struct json_object *parse_json(nvme_root_t r, int fd)
 	/* Enforce correctly formatted JSON */
 	tok->flags = JSON_TOKENER_STRICT;
 
-	obj = json_tokener_parse_ex(tok, pb->buf, printbuf_length(pb));
+	obj = json_tokener_parse_ex(tok, str, len);
 	if (!obj)
 		nvme_msg(r, LOG_DEBUG, "JSON parsing failed: %s\n",
 			 json_util_get_last_err());
 out:
 	if (tok)
 		json_tokener_free(tok);
-	printbuf_free(pb);
+	free(ptr);
 
 	return obj;
 }