From: Oleksandr Natalenko <oleksandr@natalenko.name>
Date: Mon, 2 Jan 2017 19:54:09 +0000 (+0100)
Subject: segtree: allocate memory for arrays on heap
X-Git-Tag: v0.8~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2faa5ddb658034d1ef5300d46610bd2df5fdd39f;p=thirdparty%2Fnftables.git

segtree: allocate memory for arrays on heap

Huge sets may cause stack to be exhausted.
So, put allocate memory for arrays in
interval_map_decompose() function on heap.

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/src/segtree.c b/src/segtree.c
index 5b6cdd1d..78657de1 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -608,12 +608,18 @@ static int expr_value_cmp(const void *p1, const void *p2)
 
 void interval_map_decompose(struct expr *set)
 {
-	struct expr *elements[set->size], *ranges[set->size * 2];
+	struct expr **elements, **ranges;
 	struct expr *i, *next, *low = NULL, *end;
 	unsigned int n, m, size;
 	mpz_t range, p;
 	bool interval;
 
+	if (set->size == 0)
+		return;
+
+	elements = xmalloc_array(set->size, sizeof(struct expr *));
+	ranges = xmalloc_array(set->size * 2, sizeof(struct expr *));
+
 	mpz_init(range);
 	mpz_init(p);
 
@@ -728,4 +734,7 @@ void interval_map_decompose(struct expr *set)
 
 		compound_expr_add(set, i);
 	}
+
+	xfree(ranges);
+	xfree(elements);
 }