From 50b175dbd598e80a0e67606645d1fa3c9be6ce01 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 10 Jun 2016 16:45:48 +0200 Subject: src: check for flags before releasing attributes Now that unsetters don't set pointers to NULL, check if the attribute is set before trying to release it. Signed-off-by: Pablo Neira Ayuso --- src/expr/immediate.c | 2 +- src/expr/log.c | 2 +- src/expr/match.c | 4 ++-- src/expr/target.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/expr') diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 243f0e0..22ec864 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -43,7 +43,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type, imm->data.verdict = *((uint32_t *)data); break; case NFTNL_EXPR_IMM_CHAIN: - if (imm->data.chain) + if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) xfree(imm->data.chain); imm->data.chain = strdup(data); diff --git a/src/expr/log.c b/src/expr/log.c index 5b774a4..b9b3951 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -37,7 +37,7 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type, switch(type) { case NFTNL_EXPR_LOG_PREFIX: - if (log->prefix) + if (log->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) xfree(log->prefix); log->prefix = strdup(data); diff --git a/src/expr/match.c b/src/expr/match.c index 2929b43..3342e2c 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -49,7 +49,7 @@ nftnl_expr_match_set(struct nftnl_expr *e, uint16_t type, mt->rev = *((uint32_t *)data); break; case NFTNL_EXPR_MT_INFO: - if (mt->data) + if (e->flags & (1 << NFTNL_EXPR_MT_INFO)) xfree(mt->data); mt->data = data; @@ -146,7 +146,7 @@ static int nftnl_expr_match_parse(struct nftnl_expr *e, struct nlattr *attr) uint32_t len = mnl_attr_get_payload_len(tb[NFTA_MATCH_INFO]); void *match_data; - if (match->data) + if (e->flags & (1 << NFTNL_EXPR_MT_INFO)) xfree(match->data); match_data = calloc(1, len); diff --git a/src/expr/target.c b/src/expr/target.c index 68a7d8a..d4c0091 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -49,7 +49,7 @@ nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type, tg->rev = *((uint32_t *)data); break; case NFTNL_EXPR_TG_INFO: - if (tg->data) + if (e->flags & (1 << NFTNL_EXPR_TG_INFO)) xfree(tg->data); tg->data = data; -- cgit v1.2.3