From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 23 Oct 2024 12:10:34 +0000 (+0000)
Subject: parser: Initialize r on merge
X-Git-Tag: 0.9.30~805
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=919578a00c4e3672368650511d65aa260999cd22;p=pakfire.git

parser: Initialize r on merge

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c
index 2f1589429..01673c63b 100644
--- a/src/libpakfire/parser.c
+++ b/src/libpakfire/parser.c
@@ -816,18 +816,16 @@ int pakfire_parser_merge(struct pakfire_parser* parser1, struct pakfire_parser*
 	struct pakfire_parser_declaration* d = NULL;
 	char* namespace = NULL;
 	char* value = NULL;
-	int r;
-
-	DEBUG(parser1->ctx, "Merging parsers %p and %p\n", parser1, parser2);
+	int r = 0;
 
-	if (!parser2) {
-		errno = EINVAL;
-		return 1;
-	}
+	if (!parser1 || !parser2)
+		return -EINVAL;
 
 	// Do not try to merge a parser with itself
 	if (parser1 == parser2)
-		return EINVAL;
+		return -EINVAL;
+
+	DEBUG(parser1->ctx, "Merging parsers %p and %p\n", parser1, parser2);
 
 	for (unsigned int i = 0; i < parser2->num_declarations; i++) {
 		d = parser2->declarations[i];