From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Natalenko Subject: [PATCH v2 2/2] segtree: allocate memory for arrays on heap Date: Mon, 2 Jan 2017 20:54:09 +0100 Message-ID: <20170102195409.14669-3-oleksandr@natalenko.name> References: <20170102195409.14669-1-oleksandr@natalenko.name> To: netfilter-devel@vger.kernel.org Return-path: Received: from vulcan.natalenko.name ([104.207.131.136]:44562 "EHLO vulcan.natalenko.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932983AbdABTyR (ORCPT ); Mon, 2 Jan 2017 14:54:17 -0500 Received: from localhost.localdomain (unknown [IPv6:2001:470:5b39:29:c99:116f:61fe:9756]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by vulcan.natalenko.name (Postfix) with ESMTPSA id D63F616AAEC for ; Mon, 2 Jan 2017 20:54:15 +0100 (CET) In-Reply-To: <20170102195409.14669-1-oleksandr@natalenko.name> Sender: netfilter-devel-owner@vger.kernel.org List-ID: 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 --- src/segtree.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/segtree.c b/src/segtree.c index 5b6cdd1..d3873d9 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -608,12 +608,15 @@ 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; + 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 +731,7 @@ void interval_map_decompose(struct expr *set) compound_expr_add(set, i); } + + xfree(ranges); + xfree(elements); } -- 2.11.0