diff options
| author | Florian Westphal <fw@strlen.de> | 2023-12-04 17:47:50 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-12-05 12:43:21 +0100 |
| commit | 778e4e113673c2a4daa798634c554c40f2808276 (patch) | |
| tree | 7c7e43175e0475c9a5041d4a62470cbd9aff0ef3 /src/evaluate.c | |
| parent | 58904b8b55a2a7941287f0267601eb54c75432a0 (diff) | |
evaluate: handle invalid mapping expressions gracefully
Before:
BUG: invalid mapping expression binop
nft: src/evaluate.c:2027: expr_evaluate_map: Assertion `0' failed.
After:
tests/shell/testcases/bogons/nft-f/invalid_mapping_expr_binop_assert:1:22-25: Error: invalid mapping expression binop
xy mame ip saddr map h& p p
~~~~~~~~ ^^^^
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 64deb31a..b6428018 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2024,8 +2024,8 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) /* symbol has been already evaluated to set reference */ break; default: - BUG("invalid mapping expression %s\n", - expr_name(map->mappings)); + return expr_binary_error(ctx->msgs, map->mappings, map->map, + "invalid mapping expression %s", expr_name(map->mappings)); } if (!datatype_compatible(map->mappings->set->key->dtype, map->map->dtype)) |