From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 21 Jun 2016 15:32:52 +0000 (+0200)
Subject: segtree: don't check for overlaps if set definition is empty
X-Git-Tag: v0.7~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24c9e993eeff0ed41875aa7efef5dd69db4eb537;p=thirdparty%2Fnftables.git

segtree: don't check for overlaps if set definition is empty

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>
---

diff --git a/src/segtree.c b/src/segtree.c
index 74f0fb33..fa11967a 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;