thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0098: segfault when pattern with \z() is very slow

Browse Source 
Problem:    Segfault when pattern with \z() is very slow.
Solution:   Check for NULL regprog.  Add "nfa_fail" to test_override() to be
            able to test this.  Fix that 'searchhl' resets called_emsg.
This commit is contained in:
Bram Moolenaar
2018-06-23 14:21:42 +02:00
parent 5efa0102de
commit bcf9442307
10 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/regexp_nfa.c
View File

@@ -1482,7 +1482,7 @@ nfa_regatom(void)
case '8':
case '9':
/* \z1...\z9 */
if (reg_do_extmatch != REX_USE)
if ((reg_do_extmatch & REX_USE) == 0)
EMSG_RET_FAIL(_(e_z1_not_allowed));
EMIT(NFA_ZREF1 + (no_Magic(c) - '1'));
/* No need to set nfa_has_backref, the sub-matches don't
@@ -1491,7 +1491,7 @@ nfa_regatom(void)
break;
case '(':
/* \z( */
if (reg_do_extmatch != REX_SET)
if ((reg_do_extmatch & REX_SET) == 0)
EMSG_RET_FAIL(_(e_z_not_allowed));
if (nfa_reg(REG_ZPAREN) == FAIL)
return FAIL; /* cascaded error */
@@ -5692,7 +5692,8 @@ nfa_regmatch(
nextlist->n = 0; /* clear nextlist */
nextlist->has_pim = FALSE;
++nfa_listid;
if (prog->re_engine == AUTOMATIC_ENGINE && nfa_listid >= NFA_MAX_STATES)
if (prog->re_engine == AUTOMATIC_ENGINE
&& (nfa_listid >= NFA_MAX_STATES || nfa_fail_for_testing))
{
/* too many states, retry with old engine */
nfa_match = NFA_TOO_EXPENSIVE;