aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.4.623

Browse Source 
Problem:    Crash with pattern: \(\)\{80000}  (Dominique Pelle)
Solution:   When the max limit is large fall back to the old engine.
This commit is contained in:
Bram Moolenaar
2015-02-10 18:18:17 +01:00
parent 168e04966c
commit a1d2c58985
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/regexp_nfa.c
View File

@@ -2034,9 +2034,10 @@ nfa_regpiece()
} }
/* The engine is very inefficient (uses too many states) when the /* The engine is very inefficient (uses too many states) when the
* maximum is much larger than the minimum. Bail out if we can * maximum is much larger than the minimum and when the maximum is
* use the other engine. */ * large. Bail out if we can use the other engine. */
if ((nfa_re_flags & RE_AUTO) && maxval > minval + 200) if ((nfa_re_flags & RE_AUTO)
&& (maxval > minval + 200 || maxval > 500))
return FAIL; return FAIL;
/* Ignore previous call to nfa_regatom() */ /* 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 ".". * Add "state" and possibly what follows to state list ".".
* Returns "subs_arg", possibly copied into temp_subs. * Returns "subs_arg", possibly copied into temp_subs.
*/ */
static regsubs_T * static regsubs_T *
addstate(l, state, subs_arg, pim, off) addstate(l, state, subs_arg, pim, off)
nfa_list_T *l; /* runtime state list */ nfa_list_T *l; /* runtime state list */
@@ -4392,6 +4392,7 @@ skip_add:
subs = &temp_subs; subs = &temp_subs;
} }
/* TODO: check for vim_realloc() returning NULL. */
l->t = vim_realloc(l->t, newlen * sizeof(nfa_thread_T)); l->t = vim_realloc(l->t, newlen * sizeof(nfa_thread_T));
l->len = newlen; l->len = newlen;
} }

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
623,
/**/ /**/
622, 622,
/**/ /**/