evaluate: catch implicit map expressions without known datatype

mapping_With_invalid_datatype_crash:1:8-65: Error: Implicit map expression without known datatype
bla to tcp dport map { 80 : 1.1.1.1 . 8001, 81 : 2.2.2.2 . 9001 } bla
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/evaluate.c b/src/evaluate.c
index f05cac416eb8cc4c58fda8ab644529612b11ba39..16ad6473db1ad4da180fc469f4ab6a742bb595b7 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1969,6 +1969,10 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr)
                                                  ctx->ectx.len, NULL);
                }
 
+               if (!ectx.dtype)
+                       return expr_error(ctx->msgs, map,
+                                         "Implicit map expression without known datatype");
+
                if (ectx.dtype->type == TYPE_VERDICT) {
                        data = verdict_expr_alloc(&netlink_location, 0, NULL);
                } else {

diff --git a/tests/shell/testcases/bogons/nft-f/mapping_With_invalid_datatype_crash b/tests/shell/testcases/bogons/nft-f/mapping_With_invalid_datatype_crash
new file mode 100644 (file)
index 0000000..9f7084c
--- /dev/null
+++ b/tests/shell/testcases/bogons/nft-f/mapping_With_invalid_datatype_crash
@@ -0,0 +1 @@
+bla to tcp dport map { 80 : 1.1.1.1 . 8001, 81 : 2.2.2.2 . 9001 } bla