evaluate: error out if basetypes are different

commit 45a4d4434742b425d019623812f2cce293033cdf upstream.

prefer
binop_with_different_basetype_assert:3:29-35: Error: Binary operation (<<) with different base types (string vs integer) is not supported
oifname set ip9dscp << 26 | 0x10
            ^^^^^^^~~~~~~
to assertion failure.

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

diff --git a/src/evaluate.c b/src/evaluate.c
index 2c17b3f48132d79b24ddc62e60eefe9e0f10b462..777daa43cd94376507183d87eace738a504e70fc 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1284,8 +1284,11 @@ static int expr_evaluate_binop(struct eval_ctx *ctx, struct expr **expr)
                                         "for %s expressions",
                                         sym, expr_name(right));
 
-       /* The grammar guarantees this */
-       assert(datatype_equal(expr_basetype(left), expr_basetype(right)));
+       if (!datatype_equal(expr_basetype(left), expr_basetype(right)))
+               return expr_binary_error(ctx->msgs, left, op,
+                                        "Binary operation (%s) with different base types "
+                                        "(%s vs %s) is not supported",
+                                        sym, expr_basetype(left)->name, expr_basetype(right)->name);
 
        switch (op->op) {
        case OP_LSHIFT:

diff --git a/tests/shell/testcases/bogons/nft-f/binop_with_different_basetype_assert b/tests/shell/testcases/bogons/nft-f/binop_with_different_basetype_assert
new file mode 100644 (file)
index 0000000..e843600
--- /dev/null
+++ b/tests/shell/testcases/bogons/nft-f/binop_with_different_basetype_assert
@@ -0,0 +1,5 @@
+table ip t {
+        chain c {
+                oifname set ip9dscp << 26 | 0x10
+        }
+}