For the objref map case, set->data is only non-null if set evaluation
completed successfully.
Before:
nft: src/evaluate.c:2115: expr_evaluate_mapping: Assertion `set->data != NULL' failed.
After:
expr_evaluate_mapping_no_data_assert:1:5-5: Error: No such file or directory
map m p {
^
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
src/evaluate.c | 13 ++++++++++++-
.../nft-f/expr_evaluate_mapping_no_data_assert | 4 ++++
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 tests/shell/testcases/bogons/nft-f/expr_evaluate_mapping_no_data_assert
diff --git a/src/evaluate.c b/src/evaluate.c
index 4e9a95ad4c9d..582877ecea9a 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -2144,6 +2144,10 @@ static int expr_evaluate_mapping(struct eval_ctx *ctx, struct expr **expr)
if (!set_is_map(set->flags))
return set_error(ctx, set, "set is not a map");
+ /* set already has more known issues, do not evaluate further */
+ if (set->errors)
+ return -1;
+
expr_set_context(&ctx->ectx, set->key->dtype, set->key->len);
if (expr_evaluate(ctx, &mapping->left) < 0)
return -1;
@@ -5387,12 +5391,17 @@ static int table_evaluate(struct eval_ctx *ctx, struct table *table)
static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd)
{
+ int err = -1;
+
switch (cmd->obj) {
case CMD_OBJ_ELEMENTS:
return setelem_evaluate(ctx, cmd);
case CMD_OBJ_SET:
handle_merge(&cmd->set->handle, &cmd->handle);
- return set_evaluate(ctx, cmd->set);
+ err = set_evaluate(ctx, cmd->set);
+ if (err)
+ cmd->set->errors = true;
+ break;
case CMD_OBJ_SETELEMS:
return elems_evaluate(ctx, cmd->set);
case CMD_OBJ_RULE:
@@ -5418,6 +5427,8 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd)
default:
BUG("invalid command object type %u\n", cmd->obj);
}
+
+ return err;
}
static void table_del_cache(struct eval_ctx *ctx, struct cmd *cmd)
diff --git a/tests/shell/testcases/bogons/nft-f/expr_evaluate_mapping_no_data_assert b/tests/shell/testcases/bogons/nft-f/expr_evaluate_mapping_no_data_assert
new file mode 100644
index 000000000000..34d3df61f334
--- /dev/null
+++ b/tests/shell/testcases/bogons/nft-f/expr_evaluate_mapping_no_data_assert
@@ -0,0 +1,4 @@
+map m p {
+ type ipv4_addr : counter
+ elements = { 1.2.3.4 : 1, }
+}
--
2.41.0
