From: Patrick McHardy <kaber@trash.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH] set: properly account set size when merging recursive set definitions
Date: Fri, 7 Mar 2014 11:21:19 +0100 [thread overview]
Message-ID: <1394187679-29596-1-git-send-email-kaber@trash.net> (raw)
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
src/evaluate.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/evaluate.c b/src/evaluate.c
index f10d0d9..0c19c9f 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))
--
1.8.5.3
reply other threads:[~2014-03-07 10:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394187679-29596-1-git-send-email-kaber@trash.net \
--to=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).