From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 3 Oct 2018 14:19:47 +0000 (+0200)
Subject: segtree: stop iteration on existing elements in case range is found
X-Git-Tag: v0.9.1~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a493147e60d350aca4197975281bf2ffe4cd1009;p=thirdparty%2Fnftables.git

segtree: stop iteration on existing elements in case range is found

No need to keep iterating once the range object has been allocated.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/segtree.c b/src/segtree.c
index dc2554b7..dc457d6b 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -661,16 +661,18 @@ static struct expr *get_set_interval_find(const struct table *table,
 			range_expr_value_low(low, i);
 			range_expr_value_high(high, i);
 			if (mpz_cmp(left->key->value, low) >= 0 &&
-			    mpz_cmp(right->key->value, high) <= 0)
+			    mpz_cmp(right->key->value, high) <= 0) {
 				range = range_expr_alloc(&internal_location,
 							 expr_clone(left->key),
 							 expr_clone(right->key));
+				goto out;
+			}
 			break;
 		default:
 			break;
 		}
 	}
-
+out:
 	mpz_clear(low);
 	mpz_clear(high);
 
@@ -697,14 +699,14 @@ static struct expr *get_set_interval_end(const struct table *table,
 				range = range_expr_alloc(&internal_location,
 							 expr_clone(left->key),
 							 expr_clone(i->key->right));
-				break;
+				goto out;
 			}
 			break;
 		default:
 			break;
 		}
 	}
-
+out:
 	mpz_clear(low);
 	mpz_clear(high);