From patchwork Sat Jun 15 01:16:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [libnftables,2/3] nat: xml: fix non-mandatory element From: Arturo Borrero X-Patchwork-Id: 251567 Message-Id: <20130615011610.3778.37555.stgit@nfdev.cica.es> To: netfilter-devel@vger.kernel.org Cc: pablo@netfilter.org Date: Sat, 15 Jun 2013 03:16:10 +0200 If the node isn't present, this produces segfault. Signed-off-by: Arturo Borrero Gonzalez --- src/expr/nat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/expr/nat.c b/src/expr/nat.c index cd38e83..a76f5b5 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -258,7 +258,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) /* Get and set . Not mandatory */ node = mxmlFindElement(tree, tree, "sreg_addr_min_v4", NULL, NULL, MXML_DESCEND); - if (node == NULL) { + if (node != NULL) { tmp = strtoull(node->child->value.opaque, &endptr, 10); if (tmp > UINT32_MAX || tmp < 0 || *endptr) goto err; @@ -270,7 +270,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) /* Get and set . Not mandatory */ node = mxmlFindElement(tree, tree, "sreg_addr_max_v4", NULL, NULL, MXML_DESCEND); - if (node == NULL) { + if (node != NULL) { tmp = strtoull(node->child->value.opaque, &endptr, 10); if (tmp > UINT32_MAX || tmp < 0 || *endptr) goto err; @@ -282,7 +282,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) /* Get and set . Not mandatory */ node = mxmlFindElement(tree, tree, "sreg_proto_min", NULL, NULL, MXML_DESCEND); - if (node == NULL) { + if (node != NULL) { tmp = strtoull(node->child->value.opaque, &endptr, 10); if (tmp > UINT32_MAX || tmp < 0 || *endptr) goto err; @@ -294,7 +294,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) /* Get and set . Not mandatory */ node = mxmlFindElement(tree, tree, "sreg_proto_max", NULL, NULL, MXML_DESCEND); - if (node == NULL) { + if (node != NULL) { tmp = strtoull(node->child->value.opaque, &endptr, 10); if (tmp > UINT32_MAX || tmp < 0 || *endptr) goto err;