From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 30 Aug 2023 11:12:36 +0000 (+0200)
Subject: src: remove check for NULL before calling expr_free()
X-Git-Tag: v1.0.9~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=407bf4ebb52665fd48ecc163baa1f139e609905a;p=thirdparty%2Fnftables.git

src: remove check for NULL before calling expr_free()

expr_free() already handles NULL pointer, remove redundant check.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 1121f730..bde783bd 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -83,8 +83,7 @@ static void netlink_set_register(struct netlink_parse_ctx *ctx,
 		return;
 	}
 
-	if (ctx->registers[reg] != NULL)
-		expr_free(ctx->registers[reg]);
+	expr_free(ctx->registers[reg]);
 
 	ctx->registers[reg] = expr;
 }
diff --git a/src/rule.c b/src/rule.c
index 07b95a99..35f6d8f2 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -193,8 +193,8 @@ void set_free(struct set *set)
 
 	if (--set->refcnt > 0)
 		return;
-	if (set->init != NULL)
-		expr_free(set->init);
+
+	expr_free(set->init);
 	if (set->comment)
 		xfree(set->comment);
 	handle_free(&set->handle);