From: Jeremy Sowden Date: Mon, 29 Apr 2024 19:27:52 +0000 (+0100) Subject: evaluate: handle invalid mapping expressions in stateful object statements gracefully. X-Git-Tag: v1.1.0~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52a7af9bec15a4fb4bfea86e40b70f96098f7dfd;p=thirdparty%2Fnftables.git evaluate: handle invalid mapping expressions in stateful object statements gracefully. Currently, they are reported as assertion failures: BUG: invalid mapping expression variable nft: src/evaluate.c:4618: stmt_evaluate_objref_map: Assertion `0' failed. Aborted Instead, report them more informatively as errors: /space/azazel/tmp/ruleset.1067161.nft:15:29-38: Error: invalid mapping expression variable quota name ip saddr map $quota_map ~~~~~~~~ ^^^^^^^^^^ Signed-off-by: Jeremy Sowden Signed-off-by: Pablo Neira Ayuso --- diff --git a/src/evaluate.c b/src/evaluate.c index 1682ba58..f28ef2aa 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4615,8 +4615,9 @@ static int stmt_evaluate_objref_map(struct eval_ctx *ctx, struct stmt *stmt) "Expression is not a map with objects"); 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))