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

updated for version 7.4.421

Browse Source 
Problem:    Crash when searching for "\ze*". (Urtica Dioica)
Solution:   Disallow a multi after \ze and \zs.
This commit is contained in:
Bram Moolenaar
2014-08-29 11:56:32 +02:00
parent a9537d238e
commit 2d46e6075b
4 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/regexp_nfa.c
View File

@@ -291,6 +291,7 @@ static int nfa_regpiece __ARGS((void));
static int nfa_regconcat __ARGS((void));
static int nfa_regbranch __ARGS((void));
static int nfa_reg __ARGS((int paren));
static int re_mult_next __ARGS((char *what));
#ifdef DEBUG
static void nfa_set_code __ARGS((int c));
static void nfa_postfix_dump __ARGS((char_u *expr, int retval));
@@ -1323,10 +1324,14 @@ nfa_regatom()
{
case 's':
EMIT(NFA_ZSTART);
if (re_mult_next("\\zs") == FAIL)
return FAIL;
break;
case 'e':
EMIT(NFA_ZEND);
nfa_has_zend = TRUE;
if (re_mult_next("\\ze") == FAIL)
return FAIL;
break;
#ifdef FEAT_SYN_HL
case '1':
@@ -2276,6 +2281,18 @@ nfa_reg(paren)
return OK;
}
/*
* Used in a place where no * or \+ can follow.
*/
static int
re_mult_next(what)
char *what;
{
if (re_multi_type(peekchr()) == MULTI_MULT)
EMSG2_RET_FAIL(_("E888: (NFA regexp) cannot repeat %s"), what);
return OK;
}
#ifdef DEBUG
static char_u code[50];