From: Pablo Neira Ayuso Date: Tue, 5 Dec 2023 14:26:10 +0000 (+0100) Subject: evaluate: handle invalid mapping expressions gracefully X-Git-Tag: v1.0.6.1~316 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b356c4031edbc6fd895ca8000a7d46dc16a5ebd;p=thirdparty%2Fnftables.git evaluate: handle invalid mapping expressions gracefully commit 778e4e113673c2a4daa798634c554c40f2808276 upstream. 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 --- diff --git a/src/evaluate.c b/src/evaluate.c index bdd7d458..1b4d3a6b 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1839,8 +1839,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_equal(map->map->dtype, map->mappings->set->key->dtype)) diff --git a/tests/shell/testcases/bogons/nft-f/invalid_mapping_expr_binop_assert b/tests/shell/testcases/bogons/nft-f/invalid_mapping_expr_binop_assert new file mode 100644 index 00000000..7205ff4f --- /dev/null +++ b/tests/shell/testcases/bogons/nft-f/invalid_mapping_expr_binop_assert @@ -0,0 +1 @@ +xy mame ip saddr map h& p p