From: Pablo Neira Ayuso Date: Fri, 26 May 2017 10:49:16 +0000 (+0100) Subject: segtree: reset element size counter before adding intervals to set X-Git-Tag: v0.8~162 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=255bd983fc9134489de7904ec09f09609607e540;p=thirdparty%2Fnftables.git segtree: reset element size counter before adding intervals to set Otherwise we get double the real size in terms of set elements during the interval expansion to individual elements. Signed-off-by: Pablo Neira Ayuso --- diff --git a/src/segtree.c b/src/segtree.c index 8df82a80..15e8849c 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -552,6 +552,7 @@ int set_to_intervals(struct list_head *errs, struct set *set, return -1; segtree_linearize(&list, set, init, &tree, add); + init->size = 0; list_for_each_entry_safe(ei, next, &list, list) { if (segtree_debug()) { pr_gmp_debug("list: [%.*Zx %.*Zx]\n", @@ -566,6 +567,7 @@ int set_to_intervals(struct list_head *errs, struct set *set, expr_print(init); pr_gmp_debug("\n"); } + return 0; }