From 2810b30fc3c515e38d6acabe87de7b48bb8bfc7b Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sun, 31 Jan 2016 16:46:46 +0100 Subject: regex: increase the stack tre uses for tnfa creation 10k elements stack is increased to 1000k, otherwise tnfa creation fails for reasonable sized patterns: a single literal char can add 7 elements to this stack, so regcomp of an 1500 char long pattern (with only litral chars) fails with REG_ESPACE. (the new limit allows about < 150k chars, this arbitrary limit allows most command line regex usage.) ideally there would be no upper bound: regcomp dynamically reallocates this buffer, every reallocation checks for allocation failure and at the end this stack is freed so there is no reason for special bound. however that may have unwanted effect on regcomp and regexec runtime so this is a conservative change. --- src/regex/regcomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c index 7ce29889..da6abd18 100644 --- a/src/regex/regcomp.c +++ b/src/regex/regcomp.c @@ -2688,7 +2688,7 @@ regcomp(regex_t *restrict preg, const char *restrict regex, int cflags) /* Allocate a stack used throughout the compilation process for various purposes. */ - stack = tre_stack_new(512, 10240, 128); + stack = tre_stack_new(512, 1024000, 128); if (!stack) return REG_ESPACE; /* Allocate a fast memory allocator. */ -- cgit v1.2.1