mirror of
https://github.com/vim/vim.git
synced 2025-09-28 04:24:06 -04:00
patch 8.0.1397: pattern with \& following nothing gives an error
Problem: Pattern with \& following nothing gives an error. Solution: Emit an empty node when needed.
This commit is contained in:
@@ -2321,7 +2321,6 @@ nfa_regconcat(void)
|
|||||||
static int
|
static int
|
||||||
nfa_regbranch(void)
|
nfa_regbranch(void)
|
||||||
{
|
{
|
||||||
int ch;
|
|
||||||
int old_post_pos;
|
int old_post_pos;
|
||||||
|
|
||||||
old_post_pos = (int)(post_ptr - post_start);
|
old_post_pos = (int)(post_ptr - post_start);
|
||||||
@@ -2330,11 +2329,13 @@ nfa_regbranch(void)
|
|||||||
if (nfa_regconcat() == FAIL)
|
if (nfa_regconcat() == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
|
|
||||||
ch = peekchr();
|
|
||||||
/* Try next concats */
|
/* Try next concats */
|
||||||
while (ch == Magic('&'))
|
while (peekchr() == Magic('&'))
|
||||||
{
|
{
|
||||||
skipchr();
|
skipchr();
|
||||||
|
/* if concat is empty do emit a node */
|
||||||
|
if (old_post_pos == (int)(post_ptr - post_start))
|
||||||
|
EMIT(NFA_EMPTY);
|
||||||
EMIT(NFA_NOPEN);
|
EMIT(NFA_NOPEN);
|
||||||
EMIT(NFA_PREV_ATOM_NO_WIDTH);
|
EMIT(NFA_PREV_ATOM_NO_WIDTH);
|
||||||
old_post_pos = (int)(post_ptr - post_start);
|
old_post_pos = (int)(post_ptr - post_start);
|
||||||
@@ -2344,7 +2345,6 @@ nfa_regbranch(void)
|
|||||||
if (old_post_pos == (int)(post_ptr - post_start))
|
if (old_post_pos == (int)(post_ptr - post_start))
|
||||||
EMIT(NFA_EMPTY);
|
EMIT(NFA_EMPTY);
|
||||||
EMIT(NFA_CONCAT);
|
EMIT(NFA_CONCAT);
|
||||||
ch = peekchr();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if a branch is empty, emit one node for it */
|
/* if a branch is empty, emit one node for it */
|
||||||
|
@@ -721,3 +721,11 @@ func Test_search_multibyte()
|
|||||||
enew!
|
enew!
|
||||||
let &encoding = save_enc
|
let &encoding = save_enc
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
" This was causing E874. Also causes an invalid read?
|
||||||
|
func Test_look_behind()
|
||||||
|
new
|
||||||
|
call setline(1, '0\|\&\n\@<=')
|
||||||
|
call search(getline("."))
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
@@ -771,6 +771,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 */
|
||||||
|
/**/
|
||||||
|
1397,
|
||||||
/**/
|
/**/
|
||||||
1396,
|
1396,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user