]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
set: properly account set size when merging recursive set definitions
authorPatrick McHardy <kaber@trash.net>
Fri, 7 Mar 2014 10:20:26 +0000 (11:20 +0100)
committerPatrick McHardy <kaber@trash.net>
Fri, 7 Mar 2014 10:20:26 +0000 (11:20 +0100)
Signed-off-by: Patrick McHardy <kaber@trash.net>
src/evaluate.c

index f10d0d98ab64eab2e538fb86b98f98b36cc904a6..0c19c9fc93494f50f0e9789a13b60968630e7b45 100644 (file)
@@ -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))