src: don't set data_len to zero when returning pointers

nft already assumes that passing NULL as data_len is valid, otherwise
it crashes. Fix this by leave data_len unset in this specific case.

Fixes: bda7102 ("src: Fix nftnl_*_get_data() to return the real attribute length")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index 111bf8cdbbf7f646c657df4d98184cafd636c5c1..0eaa409a9c80821b1e8d8ee83fbe05b5326daad4 100644 (file)
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -94,7 +94,6 @@ nftnl_expr_dynset_get(const struct nftnl_expr *e, uint16_t type,
                *data_len = sizeof(dynset->set_id);
                return &dynset->set_id;
        case NFTNL_EXPR_DYNSET_EXPR:
-               *data_len = 0;
                return dynset->expr;
        }
        return NULL;

diff --git a/src/set_elem.c b/src/set_elem.c
index 4e89210d363b668288509b014375a2bdca1a151b..79086615e5035d2982dae8aa3d064d595e88e9cb 100644 (file)
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -184,7 +184,6 @@ const void *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t
                *data_len = s->user.len;
                return s->user.data;
        case NFTNL_SET_ELEM_EXPR:
-               *data_len = 0;
                return s->expr;
        }
        return NULL;