From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Tue, 10 Sep 2024 16:01:35 +0000 (+0200)
Subject: libkmod: allow buf_freadchars to report errors
X-Git-Tag: v34~334
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aec79daff6695ee5b0ea750acbc3e5c61b9b8ae;p=thirdparty%2Fkmod.git

libkmod: allow buf_freadchars to report errors

The return value is currently not needed. In prepration for subsequent
commits, use the return value to report if errors occurred or not.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/123
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c
index 9c17c181..d738ea87 100644
--- a/libkmod/libkmod-index.c
+++ b/libkmod/libkmod-index.c
@@ -193,14 +193,14 @@ static uint32_t read_long(FILE *in)
 	return ntohl(l);
 }
 
-static unsigned buf_freadchars(struct strbuf *buf, FILE *in)
+static ssize_t buf_freadchars(struct strbuf *buf, FILE *in)
 {
-	unsigned i = 0;
+	ssize_t i = 0;
 	int ch;
 
 	while ((ch = read_char(in))) {
 		if (!strbuf_pushchar(buf, ch))
-			break;
+			return -1;
 		i++;
 	}
 
@@ -221,8 +221,8 @@ struct index_node_f {
 
 static struct index_node_f *index_read(FILE *in, uint32_t offset)
 {
-	struct index_node_f *node;
-	char *prefix;
+	struct index_node_f *node = NULL;
+	char *prefix = NULL;
 	int i, child_count = 0;
 
 	if ((offset & INDEX_NODE_MASK) == 0)
@@ -234,7 +234,10 @@ static struct index_node_f *index_read(FILE *in, uint32_t offset)
 	if (offset & INDEX_NODE_PREFIX) {
 		struct strbuf buf;
 		strbuf_init(&buf);
-		buf_freadchars(&buf, in);
+		if (buf_freadchars(&buf, in) < 0) {
+			strbuf_release(&buf);
+			return NULL;
+		}
 		prefix = strbuf_steal(&buf);
 	} else
 		prefix = NOFAIL(strdup(""));
@@ -270,7 +273,10 @@ static struct index_node_f *index_read(FILE *in, uint32_t offset)
 		strbuf_init(&buf);
 		while (value_count--) {
 			priority = read_long(in);
-			buf_freadchars(&buf, in);
+			if (buf_freadchars(&buf, in) < 0) {
+				strbuf_release(&buf);
+				goto err;
+			}
 			value = strbuf_str(&buf);
 			add_value(&node->values, value, buf.used, priority);
 			strbuf_clear(&buf);
@@ -281,6 +287,10 @@ static struct index_node_f *index_read(FILE *in, uint32_t offset)
 	node->prefix = prefix;
 	node->file = in;
 	return node;
+err:
+	free(prefix);
+	free(node);
+	return NULL;
 }
 
 static void index_close(struct index_node_f *node)