From: Florian Westphal <fw@strlen.de>
Date: Thu, 11 Jan 2018 15:30:20 +0000 (+0100)
Subject: src: segtree: use value expression length
X-Git-Tag: v0.8.4~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00718d13ab3f27bac767035804feb7ad0cc15a1e;p=thirdparty%2Fnftables.git

src: segtree: use value expression length

In case of EXPR_MAPPING, expr->len is 0, we need to use
the length of the key instead.

Without this we can get assertion failure later on:
nft: netlink_delinearize.c:1484: binop_adjust_one: Assertion `value->len >= binop->right->len' failed.

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

diff --git a/src/segtree.c b/src/segtree.c
index de68071c..f8d62d7a 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -809,7 +809,7 @@ void interval_map_decompose(struct expr *set)
 			struct expr *tmp;
 
 			tmp = constant_expr_alloc(&low->location, low->dtype,
-						  low->byteorder, low->len,
+						  low->byteorder, expr_value(low)->len,
 						  NULL);
 
 			mpz_add(range, range, expr_value(low)->value);