diff options
| author | Phil Sutter <phil@nwl.cc> | 2023-08-25 13:49:31 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-11-02 11:56:20 +0100 |
| commit | 4cb11a8fa543e760f64b2b218d9b058782d1601d (patch) | |
| tree | 597d2c129608ed24efb33fa78cfc4fcf51abf738 /src | |
| parent | 8daa9c64ce4e930743e91b194a5791db125b5168 (diff) | |
evaluate: Drop dead code from expr_evaluate_mapping()
commit 41f8628f6fb8340dde21e1295191a2d131c1a8df upstream.
Since commit 343a51702656a ("src: store expr, not dtype to track data in
sets"), set->data is allocated for object maps in set_evaluate(), all
other map types have set->data initialized by the parser already,
set_evaluate() also checks that.
Drop the confusing check, later in the function set->data is
dereferenced unconditionally.
Fixes: 343a51702656a ("src: store expr, not dtype to track data in sets")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src')
| -rw-r--r-- | src/evaluate.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index a9eb2ff4..937889a2 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1913,17 +1913,14 @@ static int expr_evaluate_mapping(struct eval_ctx *ctx, struct expr **expr) "Key must be a constant"); mapping->flags |= mapping->left->flags & EXPR_F_SINGLETON; - if (set->data) { - if (!set_is_anonymous(set->flags) && - set->data->flags & EXPR_F_INTERVAL) - datalen = set->data->len / 2; - else - datalen = set->data->len; - - __expr_set_context(&ctx->ectx, set->data->dtype, set->data->byteorder, datalen, 0); - } else { - assert((set->flags & NFT_SET_MAP) == 0); - } + assert(set->data != NULL); + if (!set_is_anonymous(set->flags) && + set->data->flags & EXPR_F_INTERVAL) + datalen = set->data->len / 2; + else + datalen = set->data->len; + __expr_set_context(&ctx->ectx, set->data->dtype, + set->data->byteorder, datalen, 0); if (expr_evaluate(ctx, &mapping->right) < 0) return -1; |