diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-02-10 18:18:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-02-10 18:18:17 +0100 |
| commit | b7106559e96c80db5d253bc6ca8868a99f282a7f (patch) | |
| tree | 3e7e646fcb9924aeef344634d9b28a8b48a4865e | |
| parent | e44a7a418f6100572d20c1fc64814c15c84a2db3 (diff) | |
| download | vim-b7106559e96c80db5d253bc6ca8868a99f282a7f.tar.gz | |
Problem: Crash with pattern: \(\)\{80000} (Dominique Pelle)
Solution: When the max limit is large fall back to the old engine.
| -rw-r--r-- | src/regexp_nfa.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 77c78705..22453510 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -2034,9 +2034,10 @@ nfa_regpiece() } /* The engine is very inefficient (uses too many states) when the - * maximum is much larger than the minimum. Bail out if we can - * use the other engine. */ - if ((nfa_re_flags & RE_AUTO) && maxval > minval + 200) + * maximum is much larger than the minimum and when the maximum is + * large. Bail out if we can use the other engine. */ + if ((nfa_re_flags & RE_AUTO) + && (maxval > minval + 200 || maxval > 500)) return FAIL; /* Ignore previous call to nfa_regatom() */ @@ -4254,7 +4255,6 @@ state_in_list(l, state, subs) * Add "state" and possibly what follows to state list ".". * Returns "subs_arg", possibly copied into temp_subs. */ - static regsubs_T * addstate(l, state, subs_arg, pim, off) nfa_list_T *l; /* runtime state list */ @@ -4392,6 +4392,7 @@ skip_add: subs = &temp_subs; } + /* TODO: check for vim_realloc() returning NULL. */ l->t = vim_realloc(l->t, newlen * sizeof(nfa_thread_T)); l->len = newlen; } diff --git a/src/version.c b/src/version.c index 4116c723..b52926a3 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 623, +/**/ 622, /**/ 621, |