38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 3671c48970031e617ee713b79caf8ef0a1b096c2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Westphal <fw@strlen.de>
|
||
|
|
Date: Mon, 4 Dec 2023 18:18:07 +0100
|
||
|
|
Subject: [PATCH] evaluate: guard against NULL basetype
|
||
|
|
|
||
|
|
i->dtype->basetype can be NULL.
|
||
|
|
|
||
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
||
|
|
---
|
||
|
|
src/evaluate.c | 2 +-
|
||
|
|
tests/shell/testcases/bogons/nft-f/no_integer_basetype_crash | 1 +
|
||
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
create mode 100644 tests/shell/testcases/bogons/nft-f/no_integer_basetype_crash
|
||
|
|
|
||
|
|
diff --git a/src/evaluate.c b/src/evaluate.c
|
||
|
|
index b6428018..b6670254 100644
|
||
|
|
--- a/src/evaluate.c
|
||
|
|
+++ b/src/evaluate.c
|
||
|
|
@@ -1610,7 +1610,7 @@ static int expr_evaluate_list(struct eval_ctx *ctx, struct expr **expr)
|
||
|
|
return expr_error(ctx->msgs, i,
|
||
|
|
"List member must be a constant "
|
||
|
|
"value");
|
||
|
|
- if (i->dtype->basetype->type != TYPE_BITMASK)
|
||
|
|
+ if (datatype_basetype(i->dtype)->type != TYPE_BITMASK)
|
||
|
|
return expr_error(ctx->msgs, i,
|
||
|
|
"Basetype of type %s is not bitmask",
|
||
|
|
i->dtype->desc);
|
||
|
|
diff --git a/tests/shell/testcases/bogons/nft-f/no_integer_basetype_crash b/tests/shell/testcases/bogons/nft-f/no_integer_basetype_crash
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000..16d3e41f
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/tests/shell/testcases/bogons/nft-f/no_integer_basetype_crash
|
||
|
|
@@ -0,0 +1 @@
|
||
|
|
+cPoR et ip dscp << 2>0 ,xl rt ipsec c0tt in tabl rt ipsec cl
|
||
|
|
--
|
||
|
|
2.43.4
|
||
|
|
|