From: Florian Westphal Date: Mon, 4 Dec 2023 17:18:07 +0000 (+0100) Subject: evaluate: guard against NULL basetype X-Git-Tag: v1.0.6.1~315 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8be4d2f8bc3923f7b9e0558921d04345c78294d;p=thirdparty%2Fnftables.git evaluate: guard against NULL basetype commit 3671c48970031e617ee713b79caf8ef0a1b096c2 upstream. i->dtype->basetype can be NULL. Signed-off-by: Florian Westphal --- diff --git a/src/evaluate.c b/src/evaluate.c index 1b4d3a6b..2c17b3f4 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1434,7 +1434,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