diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-25 19:35:10 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-25 20:14:53 +0200 |
| commit | 7b6f95df9eb6d9f51b2e99ba335e7b57e9a451df (patch) | |
| tree | d7f0068271a9e336b557ff8adaedd82fe77c7479 | |
| parent | a3fdb7bb924e1988ce4f90e2773cc78335afb15b (diff) | |
evaluate: stmt_evaluate_map() needs right hand side evaluation too
The data side of the mapping that is dynamically generated needs to be
evaluated as well.
Fixes: 0e90798e9812 ("src: simplify map statement")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/evaluate.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index dbeedc95..d023f47a 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2773,12 +2773,20 @@ static int stmt_evaluate_map(struct eval_ctx *ctx, struct stmt *stmt) if (stmt->map.key->comment != NULL) return expr_error(ctx->msgs, stmt->map.key, "Key expression comments are not supported"); + + if (stmt_evaluate_arg(ctx, stmt, + stmt->map.set->set->datatype, + stmt->map.set->set->datalen, + stmt->map.set->set->datatype->byteorder, + &stmt->map.data->key) < 0) + return -1; if (expr_is_constant(stmt->map.data)) return expr_error(ctx->msgs, stmt->map.data, "Data expression can not be constant"); if (stmt->map.data->comment != NULL) return expr_error(ctx->msgs, stmt->map.data, "Data expression comments are not supported"); + if (stmt->map.stmt) { if (stmt_evaluate(ctx, stmt->map.stmt) < 0) return -1; |