From eb770d79146941ce975c7b7caa9372b380978f98 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Fri, 12 Oct 2018 13:22:55 +0200
Subject: [PATCH] libnftables: Fix memleak in nft_parse_bison_filename()

Allocated scanner object leaks when returning to caller. For some odd
reason, this was missed by the commit referenced below.

Fixes: bd82e03e15df8 ("libnftables: Move scanner object into struct nft_ctx")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit a56fe55dbd3232e70514610a1c2df1d6b15b931f)
Signed-off-by: Phil Sutter <psutter@redhat.com>
---
 src/libnftables.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libnftables.c b/src/libnftables.c
index 5bc7ba0d210ab..91af169ca7190 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -418,15 +418,14 @@ static int nft_parse_bison_filename(struct nft_ctx *nft, const char *filename,
 				    struct list_head *msgs, struct list_head *cmds)
 {
 	struct cmd *cmd;
-	void *scanner;
 	int ret;
 
 	parser_init(nft, nft->state, msgs, cmds);
-	scanner = scanner_init(nft->state);
-	if (scanner_read_file(scanner, filename, &internal_location) < 0)
+	nft->scanner = scanner_init(nft->state);
+	if (scanner_read_file(nft->scanner, filename, &internal_location) < 0)
 		return -1;
 
-	ret = nft_parse(nft, scanner, nft->state);
+	ret = nft_parse(nft, nft->scanner, nft->state);
 	if (ret != 0 || nft->state->nerrs > 0)
 		return -1;
 
-- 
2.19.0