From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft] segtree: don't check for overlaps if set definition is empty
Date: Wed, 22 Jun 2016 13:07:02 +0200 [thread overview]
Message-ID: <1466593622-22159-1-git-send-email-pablo@netfilter.org> (raw)
If the set comes without definition (ie. no elements) then skip check
for overlaps since set->init is NULL.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/segtree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/segtree.c b/src/segtree.c
index 74f0fb3..fa11967 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -377,7 +377,7 @@ static int set_to_segtree(struct list_head *msgs, struct set *set,
/* We are updating an existing set with new elements, check if the new
* interval overlaps with any of the existing ones.
*/
- if (add && set->init != init) {
+ if (add && set->init && set->init != init) {
err = set_overlap(msgs, set, init, tree->keylen);
if (err < 0)
return err;
--
2.1.4
reply other threads:[~2016-06-22 11:07 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=1466593622-22159-1-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.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).