From: Patrick McHardy <kaber@trash.net>
Date: Fri, 7 Mar 2014 10:20:26 +0000 (+0100)
Subject: set: properly account set size when merging recursive set definitions
X-Git-Tag: v0.2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95e65d825e92e0ba065944b02a5fed521e4d8699;p=thirdparty%2Fnftables.git

set: properly account set size when merging recursive set definitions

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/src/evaluate.c b/src/evaluate.c
index f10d0d98..0c19c9fc 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -683,6 +683,7 @@ static int expr_evaluate_set(struct eval_ctx *ctx, struct expr **expr)
 			/* Merge recursive set definitions */
 			list_splice_tail_init(&i->expressions, &i->list);
 			list_del(&i->list);
+			set->size      += i->size;
 			set->set_flags |= i->set_flags;
 			expr_free(i);
 		} else if (!expr_is_singleton(i))