]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
src: remove check for NULL before calling expr_free()
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 30 Aug 2023 11:12:36 +0000 (13:12 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 31 Aug 2023 14:38:14 +0000 (16:38 +0200)
expr_free() already handles NULL pointer, remove redundant check.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/netlink_delinearize.c
src/rule.c

index 1121f730ffa783d00c6150c45e0dff52cdeb5d10..bde783bdf4adcc27a02877bbf34d962480870ebc 100644 (file)
@@ -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;
 }
index 07b95a993275b5ca40aa7c8ec26e920c097c354f..35f6d8f28aee6285ab1322c4176d977c53feb28f 100644 (file)
@@ -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);