From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Feb 2021 14:26:08 +0000 (+0000)
Subject: parser: Handle empty else statement returning NULL
X-Git-Tag: 0.9.28~1285^2~696
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c22cb152832499096103bebe1a696017f80f7ee;p=pakfire.git

parser: Handle empty else statement returning NULL

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

diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index 991ec0c41..9f9f73ecf 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -164,7 +164,9 @@ grammar						: %empty
 							}
 							| grammar if_stmt
 							{
-								pakfire_parser_merge($1, $2);
+								if ($2)
+									pakfire_parser_merge($1, $2);
+
 								$$ = pakfire_parser_ref($1);
 							}
 							| grammar empty
@@ -343,5 +345,8 @@ static PakfireParser make_if_stmt(Pakfire pakfire, PakfireParser* parser, const
 	free(v1);
 	free(v2);
 
-	return pakfire_parser_ref(result);
+	if (result)
+		pakfire_parser_ref(result);
+
+	return result;
 }